[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 "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 ""
 
@@ -29029,6 +28597,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 ""
 
@@ -29062,9 +28728,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 ""
 
@@ -29077,7 +28764,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:"
@@ -29756,6 +29452,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 ""
 
@@ -30250,6 +29958,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30282,22 +29993,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"
@@ -30387,6 +30089,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31076,7 +30781,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"
@@ -31109,31 +30832,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"
@@ -32214,6 +31998,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 ""
 
@@ -32547,6 +32352,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33284,6 +33092,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33694,12 +33505,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>"
@@ -34036,12 +33841,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35582,39 +35381,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 ""
 
@@ -35688,9 +35454,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/da.po b/i18n/po/da.po
index 851b269..b114882 100644
--- a/i18n/po/da.po
+++ b/i18n/po/da.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-30 16:17+0000\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-27 14:39+0000\n"
 "Last-Translator: Jørn <joern.map at gmail.com>\n"
 "Language-Team: Dansk <kde-i18n-doc at kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:40+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:40+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: da_DK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -1021,8 +1021,8 @@ msgstr "Indtast URL at downloade"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Indtast en URL hvor data skal downloades fra"
 
-msgid "Separate Layer"
-msgstr "Separat lag"
+msgid "Download as new layer"
+msgstr "Download som nyt lag"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Vælg om dataene skal hentes som et nyt lag"
@@ -2426,17 +2426,17 @@ msgstr "Konverter til GPX-lag startende fra sidste medlem"
 
 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 ""
 "Udjævner denne relation til et enkelt gpx-spor rekursivt, startende med det "
-"første medlem(er), fortsættende successivt til det sidste."
+"første medlem, fortsættende successivt til det sidste."
 
 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 ""
 "Udjævner denne relation til et enkelt gpx-spor rekursivt, startende med det "
-"sidste medlem(er), fortsættende successivt til det første."
+"sidste medlem, fortsættende successivt til det første."
 
 msgid "Selected Relations"
 msgstr "Valgte relationer"
@@ -6872,7 +6872,7 @@ msgid "Add"
 msgstr "Tilføj"
 
 msgid "Add filter."
-msgstr "tilføj filter."
+msgstr "Tilføj filter."
 
 msgid "Edit filter."
 msgstr "Rediger filter."
@@ -8863,9 +8863,6 @@ msgstr "Værdi for breddegrad i intervallet [-90,90] krævet."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Værdi for længdegrad i intervallet [-180,180] krævet."
 
-msgid "Download as new layer"
-msgstr "Download som nyt lag"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10463,7 +10460,7 @@ msgid "Note Files"
 msgstr "Notefiler"
 
 msgid "OSM Server Files bzip2 compressed"
-msgstr "OSM serverfiler bzip2-komprimeret"
+msgstr "OSM serverfiler bzip2 komprimeret"
 
 msgid "OsmChange File"
 msgstr "OsmChange fil"
@@ -10506,6 +10503,9 @@ msgstr "Ingen data fundet i filen \"{0}\"."
 msgid "Open OSM file"
 msgstr "Åbn OSM fil"
 
+msgid "OSM Server Files XZ compressed"
+msgstr "OSM server filer XZ komprimeret"
+
 msgid "Validation Error Files"
 msgstr "Valideringsfejlfil"
 
@@ -10561,7 +10561,7 @@ msgid "Load tile"
 msgstr "Hent tern"
 
 msgid "Get tile status"
-msgstr "Få tern status"
+msgstr "Vis tern status"
 
 msgid "Force tile rendering"
 msgstr "Gennemtving tern tegning"
@@ -13822,9 +13822,6 @@ msgstr "Fjernstyring"
 msgid "Settings for the remote control feature."
 msgstr "Indstillinger for fjernstyringsfunktionen"
 
-msgid "Download objects to new layer"
-msgstr "Download objekter til et nyt lag"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Bekræft alle fjernstyringshandlinger manuelt"
 
@@ -15703,6 +15700,12 @@ msgstr "Behold udvidelse"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Klik for at beholde udvidelsen \"{0}\""
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Kunne ikke installere udvidelse ''{0}'' fra midlertidig downloadet fil "
+"''{1}''. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Kunne ikke slette forældet udvidelse ''{0}''."
 
@@ -15715,12 +15718,6 @@ msgstr ""
 "af udvidelsen."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Kunne ikke installere udvidelse ''{0}'' fra midlertidig downloadet fil "
-"''{1}''. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -17715,10 +17712,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "hustag"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "kabinet"
-
 msgid "Start date"
 msgstr "Start dato"
 
@@ -19226,6 +19219,9 @@ msgstr "Biodiesel"
 msgid "Octane 80"
 msgstr "Oktan 80"
 
+msgid "Octane 87"
+msgstr "Oktan 87"
+
 msgid "Octane 91"
 msgstr "Oktan 91"
 
@@ -19247,6 +19243,9 @@ msgstr "E10 (10% Ethanol blanding)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol blanding)"
 
+msgid "Ethanol (alcohol)"
+msgstr "Ethanol (alkohol)"
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Flydende petrolium)"
 
@@ -21904,6 +21903,12 @@ msgstr "Springvand"
 msgid "Water Well"
 msgstr "Vandbrønd"
 
+msgid "Pump"
+msgstr "Pumpe"
+
+msgid "powered"
+msgstr "elektrisk"
+
 msgid "Lighthouse"
 msgstr "Fyrtårn"
 
@@ -25006,6 +25011,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 "Overlay imagery for railway mapping in 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"
 
@@ -25087,8 +25122,8 @@ msgstr "OSM Inspector: Addresses"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM Inspector: Coastline (EU)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
+msgstr "imagico.de: Prokletije Mountains"
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
@@ -25105,8 +25140,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 "
@@ -25115,22 +25150,44 @@ msgstr ""
 "Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
 "(true color)"
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
-msgstr "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: 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 ""
 "Fairly clear up-to-date image for updating glacier edges (true color)"
 
-msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
-msgstr "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgid "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 "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 
+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)"
 
@@ -25269,14 +25326,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 black-and-white 2.5m"
@@ -25308,16 +25365,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 ""
 "Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
 
-msgid "imagico.de OSM images for mapping: Heard Island coast"
-msgstr "imagico.de OSM images for mapping: Heard Island coast"
+msgid "imagico.de: Heard Island coast"
+msgstr "imagico.de: Heard Island coast"
 
 msgid ""
 "Recent image of Heard island with interior mostly cloud covered but mostly "
@@ -25385,8 +25442,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 (Belgian Style)"
@@ -25472,14 +25529,14 @@ 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 "Patchy and partly cloudy coverage in usual sources (true color)"
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
-msgstr "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
+msgstr "imagico.de: Bouvet Island"
 
 msgid "For more accurate coastline and glacier mapping (true color)"
 msgstr "For more accurate coastline and glacier mapping (true color)"
@@ -25649,38 +25706,36 @@ msgstr "High quality aerial imagery taken for the City of Kelowna"
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna Roads overlay"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
-msgstr "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
+msgstr "imagico.de: Eastern Devon Island coast"
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr "Coastline mostly mapped meanwhile (false color IR)"
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
-msgstr "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: Northern Ellesmere Island"
+msgstr "imagico.de: Northern Ellesmere Island"
 
 msgid ""
 "Assembled from July 2012 ASTER imagery (true color with estimated blue)"
 msgstr ""
 "Assembled from July 2012 ASTER imagery (true color with estimated blue)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
-msgstr ""
-"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgid "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 ""
 "Assembled from July 2016 ASTER imagery (true color with estimated blue)"
 
-msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
-msgstr "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgid "imagico.de: Fogo, Cape Verde"
+msgstr "imagico.de: Fogo, Cape Verde"
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr "Image from after the 2014/2015 eruption (true color)"
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
-msgstr "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
+msgstr "imagico.de: Isla Londonderry"
 
 msgid ""
 "A lot of very coarse coastlines could be improved here, much snow cover "
@@ -25689,8 +25744,8 @@ msgstr ""
 "A lot of very coarse coastlines could be improved here, much snow cover "
 "though so no use for glacier mapping (false color IR)"
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
-msgstr "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
+msgstr "imagico.de: Volcán Calbuco"
 
 msgid "Image from after the 2015 eruption (true color)"
 msgstr "Image from after the 2015 eruption (true color)"
@@ -25737,8 +25792,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 "
@@ -25747,9 +25802,8 @@ msgstr ""
 "2007 ASTER image offering better glacier coverage than common sources (true "
 "color with estimated blue)"
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
-msgstr ""
-"imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "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 "
@@ -25921,10 +25975,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 "
@@ -25933,12 +25985,8 @@ msgstr ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
 "and shoals (true color)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
-msgstr ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: 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 "
@@ -25947,11 +25995,11 @@ msgstr ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
 "and shoals (false color IR)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgid "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"
@@ -25983,66 +26031,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 "
@@ -26051,14 +26089,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 "
@@ -26127,14 +26165,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 "
@@ -26143,8 +26181,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 "
@@ -26153,8 +26191,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 "
@@ -26163,20 +26201,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)"
@@ -26283,14 +26321,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 "
@@ -26299,8 +26337,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)"
@@ -26403,14 +26441,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"
 
@@ -26519,6 +26549,22 @@ 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"
 
@@ -26529,6 +26575,36 @@ 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 ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+
+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"
 
@@ -26537,14 +26613,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 "
@@ -26559,8 +26635,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 "
@@ -26569,31 +26645,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)"
@@ -26661,8 +26735,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"
@@ -26694,6 +26771,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"
 
@@ -26742,37 +26825,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 "
@@ -26781,8 +26860,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)"
@@ -26831,26 +26910,26 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
-msgstr "imagico.de OSM 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 Spain"
@@ -26873,8 +26952,8 @@ msgstr "IDEIB - Balearic Islands"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Canary Islands"
 
-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)"
@@ -26969,9 +27048,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 "
@@ -26980,6 +27058,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"
 
@@ -26998,8 +27083,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)"
@@ -27071,8 +27156,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 "
@@ -27081,14 +27166,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)"
@@ -27189,8 +27274,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 "
@@ -27199,8 +27292,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"
@@ -27214,6 +27307,12 @@ msgstr "Ukraine - Kyiv 2014 (DZK)"
 msgid "7th Series (OS7)"
 msgstr "7th Series (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr "Hampshire Aerial FCIR"
+
+msgid "Hampshire Aerial RGB"
+msgstr "Hampshire Aerial RGB"
+
 msgid "OS New Popular Edition historic"
 msgstr "OS New Popular Edition historic"
 
@@ -28371,49 +28470,42 @@ msgstr "{0} skal være et helt tal mellem -5 og 5"
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr "{0} skal kun have numre med valgfri .5 intervaller"
 
+msgid "unusual value of {0}: use . instead of , as decimal separator"
+msgstr "usædvanlig værdi for {0}: brug . i stedet for , som decimalseparator"
+
 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}: meter er standard; punktum er  separator; hvis enheder, brug mellemrum "
-"så enhed"
+"usædvanlig værdi for {0}: meter er standard; punktum er decimalseparator; "
+"hvis enheder, brug mellemrum derefter enhed"
 
 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}: ton er standard; punktum adskiller decimaler; hvis enheder sæt "
-"mellemrum derefter enhed"
+"usædvanlig værdi for {0}: ton er standard; punktum er decimalseparator; hvis "
+"enheder, brug mellemrum derefter enhed"
 
-msgid "unusual {0} format"
-msgstr "usædvanligt {0} format"
+msgid "unusual value of {0}"
+msgstr "usædvanlig værdi for {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}: kilometer er standard; punktum adskiller decimaler; hvis enheder sæt "
-"mellemrum derefter enhed"
+"usædvanlig værdi for {0}: kilometer er standard; punktum er "
+"decimalseparator; hvis enheder, brug mellemrum derefter enhed"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr "spænding bør være i volt uden enheder/skilletegn/mellemrum"
 
-msgid "unusual {0} specification"
-msgstr "usædvanlig {0} specifikation"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "usædvanlig tog sporvidde; bruge mm uden separator"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr "usædvanlig hældning; bruge procenter/grader eller op/ned"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} skal være en numerisk værdi"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} skal være et positivt heltal"
 
-msgid "unusual value of {0}"
-msgstr "usædvanlig værdi for {0}"
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr "{0} skal være en numerisk værdi, i meter og uden enheder"
 
@@ -28528,6 +28620,9 @@ msgstr "Skjul ikoner ved lav zoom"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Mindre skæmmende punktsymboler ved lav zoom"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr "Skjul tagget vejpunkter ved lav zoom"
+
 msgid "Display street labels (at high zoom)"
 msgstr "Vis gadenavne (ved høj zoom)"
 
@@ -28586,6 +28681,9 @@ msgstr ""
 "Tildeler automatisk adressen til et valgt objekt i Østrig. 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."
@@ -28632,6 +28730,9 @@ msgstr ""
 "Implementerer en kommandolinje og gør det muligt at oprette dine egne "
 "kommandoer. Se link til standard kommandoer (bue, cirkel osv.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr "Værktøj der sammensmelter data (matcher og sammenlægger)."
 
@@ -28688,6 +28789,12 @@ msgstr "Viser elevationsprofilen og nogle statistiske data for et GPX spor."
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Håndtering af franske EPCI (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+"Tilbyder en hændelsesbus kraftigere end den traditionelle lytte registrering"
+
 msgid "Use external scripts in JOSM"
 msgstr "Brug eksterne scripts i JOSM"
 
@@ -28902,6 +29009,9 @@ msgid ""
 msgstr ""
 "Tillader at åbne gpx/osm-filer, der overlapper det nuværende synlige område"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -29776,578 +29886,6 @@ msgstr "Importer billede med geografiske koordinater"
 msgid "Error while creating image layer: "
 msgstr "Fejl ved oprettelse af billedlag: "
 
-msgid "Mapillary Images"
-msgstr "Mapillary billeder"
-
-msgid "Mapillary layer"
-msgstr "Mapillary lag"
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-"{0} sekvenser, der hver indeholder mellem {1} og {2} billeder (ø {3})"
-
-msgid "{0} imported images"
-msgstr "{0} importerede billeder"
-
-msgid "{0} downloaded images"
-msgstr "{0} downloadede billeder"
-
-msgid "{0} images in total"
-msgstr "{0} billeder i alt"
-
-msgid "{0} images in {1} sequences"
-msgstr "{0} billeder i {1} sekvenser"
-
-msgid "Mapillary object layer"
-msgstr "Mapillary objekt lag"
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr "Viser laget der viser de kortobjekter, der er fundet af Mapillary"
-
-msgid "Open Mapillary layer"
-msgstr "Åben Mapillary lag"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Download Mapillary images in current view"
-msgstr "Download Mapillary billeder i den aktuelle visning"
-
-msgid "Export pictures"
-msgstr "Exporter billeder"
-
-msgid "Export Mapillary pictures"
-msgstr "Exporter Mapillary billeder"
-
-msgid "Export images"
-msgstr "Exporter billeder"
-
-msgid "Import pictures"
-msgstr "Importer billeder"
-
-msgid "Import local pictures"
-msgstr "Importer lokale billeder"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Importer billeder til Mapillary lag"
-
-msgid "Join mode"
-msgstr "Sammenlæg tilstand"
-
-msgid "Join/unjoin pictures"
-msgstr "Sammenlæg/adskil billeder"
-
-msgid "Submit changeset"
-msgstr "Indsend rettesæt"
-
-msgid "Submit the current changeset"
-msgstr "Indsend det aktuelle rettesæt"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "Indsend det aktuelle rettesæt til Mapillary"
-
-msgid "rejected"
-msgstr "afvist"
-
-msgid "pending"
-msgstr "afventer"
-
-msgid "approved"
-msgstr "godkendt"
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr "{0} indsendte billeder, Rettesæt nøgle: {1}, Tilstand: {2}"
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr "Rettesæt upload mislykkedes med {0} fejl ''{1} {2}''!"
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-"En hændelse opstod under forsøget på at indsende et rettesæt. Hvis det sker "
-"gentagne gange, overvej da at rapportere en fejl via menuen Hjælp. Hvis "
-"denne meddelelse vises for første gang, så prøv igen. Der kan have været et "
-"problem med internetforbindelsen."
-
-msgid "Upload Mapillary images"
-msgstr "Upload Mapillary billeder"
-
-msgid "Walk mode"
-msgstr "Gå tilstand"
-
-msgid "Zoom to selected image"
-msgstr "Zoom til valgt billede"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Zoom til det aktuelt valgt Mapillary billede"
-
-msgid "Current Mapillary changeset"
-msgstr "Aktuelt Mapillary rettesæt"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Åben Mapillary rettesæt dialog"
-
-msgid "Mapillary changeset"
-msgstr "Mapillary rettesæt"
-
-msgid "Submitting changeset to server…"
-msgstr "Indsender rettesæt til server…"
-
-msgid "Export all images"
-msgstr "Eksporter alle billeder"
-
-msgid "Export selected sequence"
-msgstr "Eksporter valgte rækkefølge"
-
-msgid "Export selected images"
-msgstr "Eksporter valgte billeder"
-
-msgid "Rewrite imported images"
-msgstr "Genskriv importerede billeder"
-
-msgid "Select a directory"
-msgstr "Vælg en mappe"
-
-msgid "Explore"
-msgstr "Filstyringsprogram"
-
-msgid "Speed limit"
-msgstr "Hastighedsbegrænsning"
-
-msgid "Give way"
-msgstr "Ubetinget vigepligt"
-
-msgid "No entry"
-msgstr "Indkørsel forbudt"
-
-msgid "Intersection danger"
-msgstr "Farligt vejkryds"
-
-msgid "Mandatory direction (any)"
-msgstr "Påbudt kørselsretning (enhver)"
-
-msgid "Uneven road"
-msgstr "Ujævn vej"
-
-msgid "No parking"
-msgstr "Parking forbudt"
-
-msgid "No overtaking"
-msgstr "Overhaling forbudt"
-
-msgid "Pedestrian crossing"
-msgstr "Fodgængerfelt"
-
-msgid "No turn"
-msgstr "Sving forbudt"
-
-msgid "Years"
-msgstr "År"
-
-msgid "Months"
-msgstr "Måneder"
-
-msgid "Days"
-msgstr "Dage"
-
-msgid "Imported images"
-msgstr "Importerede billeder"
-
-msgid "Mapillary filter"
-msgstr "Mapillary filter"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Åbn Mapillary dialog filter"
-
-msgid "Not older than: "
-msgstr "Ikke ældre end: "
-
-msgid "Downloaded images"
-msgstr "Downloadede billeder"
-
-msgid "Only images with signs"
-msgstr "Kun billeder med skilte"
-
-msgid "Choose signs"
-msgstr "Vælg skilte"
-
-msgid "Mapillary history"
-msgstr "Mapillary historie"
-
-msgid "Open Mapillary history dialog"
-msgstr "Åbn Mapillary historie dialog"
-
-msgid "No image selected"
-msgstr "Intet billede valgt"
-
-msgid "Press \"{0}\" to download images"
-msgstr "Tryk \"{0}\" for at downloade billeder"
-
-msgid "Mapillary picture"
-msgstr "Mapillary billede"
-
-msgid "Open Mapillary window"
-msgstr "Åbn Mapillary vindue"
-
-msgid "Next picture"
-msgstr "Næste billede"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Viser det næste billede i sekvensen"
-
-msgid "Previous picture"
-msgstr "Forrige billede"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Viser det forrige billede i sekvensen"
-
-msgid "Jump to red"
-msgstr "Hop til rød"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Hopper til billedet i den anden ende af den røde linje"
-
-msgid "Jump to blue"
-msgstr "Hop til blå"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Hopper til billedet i den anden ende af den blå linje"
-
-msgid "Stops the walk."
-msgstr "Stopper gåtur."
-
-msgid "Play"
-msgstr "Afspil"
-
-msgid "Continues with the paused walk."
-msgstr "Fortsætter med den gåtur der er på pause."
-
-msgid "Pause"
-msgstr "Pause"
-
-msgid "Pauses the walk."
-msgstr "Sætter gåturen på pause."
-
-msgid "Display hour when the picture was taken"
-msgstr "Vis hvornår billedet blev taget"
-
-msgid "Use 24 hour format"
-msgstr "Brug 24-timers format"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr "Flyt til billedets placering med næste/forrige knapper"
-
-msgid "Preview images when hovering its icon"
-msgstr "Forhåndsvis billeder når markør er over dets ikon"
-
-msgid "Cut off sequences at download bounds"
-msgstr "Afskær sekvenser ved download grænse"
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-"Ved åbning af Mapillary billede i webbrowser, vis sløringseditoren i stedet "
-"for billedviseren"
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr "Aktiver eksperimentelle beta-funktioner (muligvis ustabil)"
-
-msgid "Download mode"
-msgstr "Download tilstand"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr "Antal billeder der skal hentes (frem og tilbage)"
-
-msgid "You are logged in as ''{0}''."
-msgstr "Du er logget ind som ''{0}''."
-
-msgid "You are currently not logged in."
-msgstr "Du er i øjeblikket ikke logget ind."
-
-msgid "Login"
-msgstr "Log ind"
-
-msgid "Logout"
-msgstr "Log ud"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr "Gå til indstilling og log på Mapillary før upload."
-
-msgid "Upload selected sequence"
-msgstr "Upload valgt rækkefølge"
-
-msgid "Delete after upload"
-msgstr "Slet efter upload"
-
-msgid "Wait for full quality pictures"
-msgstr "Vent på fuld kvalitets billeder"
-
-msgid "Follow selected image"
-msgstr "Følg valgt billede"
-
-msgid "Go forward"
-msgstr "Gå frem"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr "Hvilke billedlag vil du importere til Mapillary laget?"
-
-msgid "Import"
-msgstr "Importer"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr "Kunne ikke importere et geotagget billede til Mapillary laget!"
-
-msgid "{0} ({1} images)"
-msgstr "{0} ({1} billeder)"
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr "Fra hvilken kilde vil du importere billeder til Mapillary laget?"
-
-msgid "There are currently no layers with geotagged images!"
-msgstr "Der er i øjeblikket ingen lag med geotagged billeder!"
-
-msgid "Images from my file system"
-msgstr "Billeder fra mit filsystem"
-
-msgid "Select the images you want to import"
-msgstr "Vælg de billeder du vil importere"
-
-msgid "All images in a directory"
-msgstr "Alle billeder i en mappe"
-
-msgid "Select directory to import images from"
-msgstr "Vælg mappe til at importere billeder fra"
-
-msgid "From existing image layer"
-msgstr "Fra eksisterende billedlag"
-
-msgid "Import exception"
-msgstr "Import hændelse"
-
-msgid "Could not import the image ''{0}''!"
-msgstr "Kunne ikke importere billedet ''{0}''!"
-
-msgid "Could not import the directory ''{0}''!"
-msgstr "Kunne ikke importere mappen ''{0}''!"
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-"Et tag med nøgle <i>{0}</i> er allerede til stede på det valgte OSM objekt."
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-"Vil du virkelig erstatte den nuværende værdi <i>{0}</i> med den nye værdi "
-"<i>{1}</i>?"
-
-msgid "Tag conflict"
-msgstr "Tag konflikt"
-
-msgid "Key copied to clipboard"
-msgstr "Nøgle kopieret til udklipsholder"
-
-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 ""
-"Mapillary udvidelsen bruger nu et separat panel til at vise ekstra "
-"information (som billednøglen) og handlinger for det aktuelt valgte "
-"Mapillary billede (som at se det i en browser)."
-
-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 ""
-"Det kan aktiveres ved at klikke på den venstre knap nederst i denne "
-"meddelelse eller knappen i værktøjslinjen til venstre, som bruger det samme "
-"ikon."
-
-msgid "I got it, close this."
-msgstr "Jeg fik det, luk dette."
-
-msgid "Image info"
-msgstr "Billedinformation"
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-"Viser detaljerede oplysninger om det aktuelt valgte Mapillary billede"
-
-msgid "Show detections on top of image"
-msgstr "Vis detekteringer oven på billedet"
-
-msgid "View in browser"
-msgstr "Vis i browser"
-
-msgid "Copy key"
-msgstr "Kopier nøgle"
-
-msgid "Add Mapillary tag"
-msgstr "Tilføj Mapillary tag"
-
-msgid "Image detections"
-msgstr "Billedetektioner"
-
-msgid "Image actions"
-msgstr "Billedhandlinger"
-
-msgid "Image key"
-msgstr "Billednøgle"
-
-msgid "Sequence key"
-msgstr "Sekvensnøgle"
-
-msgid "{0} detections"
-msgstr "{0} detekteringer"
-
-msgid "image has no key"
-msgstr "Billedet har ingen nøgle"
-
-msgid "unknown user"
-msgstr "ukendt bruger"
-
-msgid "sequence has no key"
-msgstr "sekvens har ingen nøgle"
-
-msgid "Could not open the URL {0} in a browser"
-msgstr "Kunne ikke åbne URL {0} i en browser"
-
-msgid "Downloading map objects…"
-msgstr "Downloader kortobjekter…"
-
-msgid "All map objects loaded."
-msgstr "Alle kortobjekter er indlæst."
-
-msgid "Too many map objects, zoom in to see all."
-msgstr "For mange kortobjekter, zoom ind for at se alle."
-
-msgid "Downloading map objects failed!"
-msgstr "Downloading af kortobjekter mislykkedes!"
-
-msgid "Mapillary objects"
-msgstr "Mapillary objekter"
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-"Viser objekter der er registreret af Mapillary fra deres gade niveau billeder"
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] "Slettede {0} billede"
-msgstr[1] "Slettede {0} billeder"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "Importerede {0} billede"
-msgstr[1] "Importerede {0} billeder"
-
-msgid "2 images joined"
-msgstr "2 billeder lagt sammen"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "Flyttede {0} billede"
-msgstr[1] "Flyttede {0} billeder"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "Drejede {0} billede"
-msgstr[1] "Drejede {0} billeder"
-
-msgid "2 images unjoined"
-msgstr "2 billeder adskilt"
-
-msgid "Could not read from URL {0}!"
-msgstr "Kunne ikke læse fra URL {0}!"
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-"{0}\n"
-"Kunne ikke læse kortobjekter fra URL\n"
-"{1}!"
-
-msgid "everything in the visible area"
-msgstr "alt i det synlige område"
-
-msgid "areas with downloaded OSM-data"
-msgstr "områder med downloadet OSM-data"
-
-msgid "only when manually requested"
-msgstr "kun ved manuel anmodet"
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-"Mapillary laget er stoppet med at downloade billeder, fordi det ønskede "
-"område er for stort!"
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-"For at løse dette problem kan du zoome ind og indlæse et mindre område på "
-"kortet."
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-"For at løse dette problem kan du skifte til download mode ''{0}'' og indlæse "
-"Mapillary billeder for en mindre del af kortet."
-
-msgid "Downloading"
-msgstr "Downloader"
-
-msgid "Select mode"
-msgstr "Vælg tilstand"
-
-msgid "Mapillary login"
-msgstr "Mapillary login"
-
-msgid "Login successful, return to JOSM."
-msgstr "Login lykkes, vend tilbage til JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Understøttede billedformater (JPG og PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "Downloader Mapillary billeder"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Total antal Mapillary billeder: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr "Indsender Mapillary rettesæt"
-
-msgid "No images found"
-msgstr "Ingen billeder fundet"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr "Du har med succes uploadet {0} billeder til mapillary.com"
-
-msgid "Finished upload"
-msgstr "Upload færdig"
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-"Du er ikke logget ind, du kan logge ind på Mapillary under indstillinger"
-
-msgid "Not Logged in to Mapillary"
-msgstr "Ikke logget ind på Mapillary"
-
-msgid "Uploading: {0}"
-msgstr "Uploader: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -31168,6 +30706,110 @@ msgstr "Der blev ikke fundet nogen adresse for dette objekt."
 msgid "An unexpected exception occurred:"
 msgstr "Der opstod en uventet hændelse:"
 
+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 ""
+"Dette værktøj kan kun erstatte et punkt, opgradere et punkt til en vej eller "
+"et multipolygon, eller erstatte en vej med en vej."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "Punkt tilhører vej(e), kan ikke erstatte."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr "Relation er ikke multipolygon, kan ikke anvendes som en erstatning."
+
+msgid "Replace geometry for node {0}"
+msgstr "Erstat geometri for punkt {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Vælg en vej der findes i databasen, og en ny vej med korrekt geometri."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "Vejene skal være helt inden det downloadede område."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"Vejen der skal erstattes, kan ikke have nogen punkter med egenskaber eller "
+"relation medlemskaber, medmindre de tilhører begge veje."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"Overskredet iterationsgrænse for robust metode, bruger mere simpel metode."
+
+msgid "Replace geometry for way {0}"
+msgstr "Erstat geometri for vej {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Alt for mange vej tilføjet: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr "Bygnings generalisering"
 
@@ -31204,9 +30846,30 @@ msgstr "Bygnings-tags:"
 msgid "Cannot place building outside of the world."
 msgstr "Kan ikke placerere bygninger uden for verdenen."
 
+msgid "Add nodes for building"
+msgstr "Tilføj punkter til bygning"
+
 msgid "Create building"
 msgstr "Opret bygning"
 
+msgid "Add address for building"
+msgstr "Tilføj adresse til bygning"
+
+msgid "Set building shape to circle"
+msgstr "Sæt bygningsform til cirkel"
+
+msgid "Set buildings shape to circle"
+msgstr "Sæt bygningsformer til cirkel"
+
+msgid "Data: {0}"
+msgstr "Data: {0}"
+
+msgid "Set building shape to rectangle"
+msgstr "Sæt bygningsform til rektangel"
+
+msgid "Set buildings shape to rectangle"
+msgstr "Sæt bygningsformer til rektangel"
+
 msgid "Set buildings size"
 msgstr "Sæt størrelse på bygninger"
 
@@ -31219,8 +30882,17 @@ msgstr "Auto-marker bygning"
 msgid "Use address nodes under buildings"
 msgstr "Brug adressepunkter under bygninger"
 
-msgid "Buildings width:"
-msgstr "Bygningsbredde:"
+msgid "Circle"
+msgstr "Cirkel"
+
+msgid "Rectangle"
+msgstr "Rektangel"
+
+msgid "Set buildings size and shape"
+msgstr "Sæt bygnings størrelse og form"
+
+msgid "Buildings width/diameter:"
+msgstr "Bygnings bredde/diameter:"
 
 msgid "Length step:"
 msgstr "Længde trin:"
@@ -31962,6 +31634,18 @@ msgstr "Slet det valgte skema fra listen."
 msgid "Color Schemes"
 msgstr "Farveskemaer"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Afbryd tag redigering og luk dialog"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Anvend redigerede tags og luk dialog"
+
 msgid "Conflation"
 msgstr "Sammensmeltning"
 
@@ -32479,6 +32163,9 @@ msgstr "Åbn GeoChat panel"
 msgid "Zoom in to see messages"
 msgstr "Zoom ind for at se beskeder"
 
+msgid "Login"
+msgstr "Log ind"
+
 msgid "Enable autologin"
 msgstr "Slå autologin til"
 
@@ -32511,24 +32198,15 @@ msgstr "Privat samtale"
 msgid "Close tab"
 msgstr "Luk fane"
 
+msgid "Logout"
+msgstr "Log ud"
+
 msgid "Clear log"
 msgstr "Ryd log"
 
 msgid "Show users on map"
 msgstr "Vis brugere på kort"
 
-msgid "GeoJSON file"
-msgstr "GeoJSON fil"
-
-msgid "Loading json file..."
-msgstr "Indlæser json fil..."
-
-msgid "Data Layer from GeoJSON: "
-msgstr "Datalag fra GeoJSON: "
-
-msgid "Error loading geojson file {0}"
-msgstr "Fejl ved indlæsning af geojson fil {0}"
-
 msgid "Position only"
 msgstr "Kun position"
 
@@ -32619,6 +32297,9 @@ msgstr "Globalsat-import"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importer data fra Globalsat Datalogger DG100 til GPX lag."
 
+msgid "Import"
+msgstr "Importer"
+
 msgid "GPS Blams"
 msgstr "GPS støj"
 
@@ -33352,8 +33033,27 @@ msgstr "Strukturtype:"
 msgid "Offset into background:"
 msgstr "Forskydning i baggrund:"
 
-msgid "Indoor Mapping Helper"
-msgstr "Indendørs Kortlægnings Helper"
+msgid "ConfirmObjectDrawing"
+msgstr "Bekræft objekttegning"
+
+msgid "ConfirmMultipolygonSelection"
+msgstr "Bekræft multipolygon valg"
+
+msgid "Please insert a value."
+msgstr "Indsæt en værdi"
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+"Tryk først på mellemrumstasten for at tilføje \"ydre\" objekt til relation."
+
+msgid "Relation-Error"
+msgstr "Relation fejl"
+
+msgid "No data selected."
+msgstr "Ingen data valgt."
+
+msgid "No relation or no relation member with role \"outer\" selected."
+msgstr "Ingen relation eller intet relationsmedlem med rolle \"ydre\" valgt."
 
 msgid "POWER"
 msgstr "TÆND"
@@ -33385,36 +33085,104 @@ msgstr "Angiver ref tag når rum-objektet er valgt."
 msgid "Apply Tags"
 msgstr "Anvend tags"
 
-msgid "Fitting"
-msgstr "Montering"
+msgid "Add a new level"
+msgstr "Tilføj nyt niveau"
 
 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>Du kan begynde at montere dine bygningsplaner nu.<br>For at gøre "
-"dette, brug BilledLag udvidelsen, som du kan installere<br>ved hjælp af JOSM "
-"udvidelse styringen.</html>"
-
-msgid "Level Selection"
-msgstr "Niveau valg"
-
-msgid "Lowest Level"
-msgstr "Laveste niveau"
+"<html> Indsæt det nye niveau nummer, du vil tilføje.<br> <i> Info </i>: <br> "
+"Hvis OK-knappen blev trykket, vil du skifte til tegningsaktionen. <br> For "
+"at afslutte det nye objekt, tryk på mellemrumstasten. Det nye niveau<br>vil "
+"blive tagget automatisk. </html>"
 
-msgid "The lowest level of your building."
-msgstr "Det laveste niveau af din bygning."
+msgid "level number:"
+msgstr "niveau nummer:"
 
-msgid "Highest Level"
-msgstr "Højeste niveau"
+msgid "Example: ''2'' or ''3''"
+msgstr "Eksempel: ''2'' eller ''3''"
 
-msgid "The highest level of your building."
-msgstr "Det højeste niveau af din bygning."
+msgid "Indoor Mapping Helper"
+msgstr "Indendørs kortlægnings hjælper"
 
 msgid "Toolbox for indoor mapping assistance"
 msgstr "Værktøjskasse til indendørs kortlægnings assistance"
 
+msgid "Insert level"
+msgstr "Indsæt niveau"
+
+msgid "Add a new level to layer."
+msgstr "Tilføj nyt niveau til lag."
+
+msgid "<html><b>?</strong></b>"
+msgstr "<html><b>?</strong></b>"
+
+msgid "Show Help-Browser."
+msgstr "Vis hælpe browser."
+
+msgid "Level name"
+msgstr "Niveau navn"
+
+msgid "Sets optional name tag for a level."
+msgstr "Sæt valgfri navne tag for et niveau."
+
+msgid "Working level: NONE"
+msgstr "Arbejdsniveau: INGEN"
+
+msgid "Shows the current working level."
+msgstr "Viser det aktuelle arbejdsniveau."
+
+msgid "Deactivate automatic level tagging."
+msgstr "Deaktiver automatisk niveau tagging."
+
+msgid "Sets the name tag."
+msgstr "Sæt navne tag."
+
+msgid "Sets the referance tag."
+msgstr "Sæt referance tag."
+
+msgid "Repeat on"
+msgstr "Gentag til"
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+"Sæt gentagelsen på tag, når vejobjekter er valgt. Tag på denne måde: -3-4 "
+"eller -2--3 eller 5-6."
+
+msgid "OUTER"
+msgstr "YDRE"
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+"Oprettelsesværktøj til multipolygon med rolle: ydre. For at afslutte tryk på "
+"mellemrumstasten"
+
+msgid "INNER"
+msgstr "INDRE"
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+"Oprettelsesværktøj til multipolygoner med rolle: indre. For at afslutte tryk "
+"på mellemrumstasten. For at tilføje til relation vælg \"ydre\" og tryk enter."
+
+msgid "Deactivate multipolygon function."
+msgstr "Deaktiver multipolygon funktion."
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr "Tilføj valgte tags og/eller relationer til objekt."
+
+msgid "Working level: {0}"
+msgstr "Arbejdsniveau: {0}"
+
 msgid "InfoMode"
 msgstr "Infotilstand"
 
@@ -34567,6 +34335,27 @@ msgstr "Ukendt filtype: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Fortolkning af fil \"{0}\" fejlede"
 
+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"
 
@@ -34905,6 +34694,9 @@ msgstr "Rediger foto GPS-data"
 msgid "Please select an image first."
 msgstr "Vælg et billede først."
 
+msgid "No image selected"
+msgstr "Intet billede valgt"
+
 msgid "(Empty values delete the according fields.)"
 msgstr "(Tomme værdier sletter de tilhørende felter.)"
 
@@ -35666,6 +35458,9 @@ msgstr "underforstået"
 msgid "State"
 msgstr "Stat"
 
+msgid "pending"
+msgstr "afventer"
+
 msgid "[incomplete]"
 msgstr "[ufuldstændig]"
 
@@ -36086,12 +35881,6 @@ msgstr "Ny værdi for {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr "Indstilling ''{0}'' mangler. Kan ikke initialisere SdsApi."
 
-msgid "Failed to open connection to API {0}."
-msgstr "Kunne ikke åbne forbindelse til API {0}."
-
-msgid "Proxy Authentication Required"
-msgstr "Proxy godkendelse krævet"
-
 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>"
@@ -36452,12 +36241,6 @@ msgstr "JOSM tag-editor-udvidelse"
 msgid "Presets"
 msgstr "Prædefinerede"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Afbryd tag redigering og luk dialog"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Anvend redigerede tags og luk dialog"
-
 msgid "Highlight"
 msgstr "Fremhæv"
 
@@ -38149,45 +37932,6 @@ msgstr ""
 "Dette værktøj erstatter geometri af et objekt med et andet, og kræver "
 "nøjagtig to objekter, der skal vælges."
 
-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 ""
-"Dette værktøj kan kun erstatte et punkt, opgradere et punkt til en vej eller "
-"et multipolygon, eller erstatte en vej med en vej."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "Punkt tilhører vej(e), kan ikke erstatte."
-
-msgid "Replace geometry for node {0}"
-msgstr "Erstat geometri for punkt {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr "Relation er ikke multipolygon, kan ikke anvendes som en erstatning."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Vælg en vej der findes i databasen, og en ny vej med korrekt geometri."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "Vejene skal være helt inden det downloadede område."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"Vejen der skal erstattes, kan ikke have nogen punkter med egenskaber eller "
-"relation medlemskaber, medmindre de tilhører begge veje."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"Overskredet iterationsgrænse for robust metode, bruger mere simpel metode."
-
-msgid "Replace geometry for way {0}"
-msgstr "Erstat geometri for vej {0}"
-
 msgid "Replace Membership"
 msgstr "Erstat medlemskab"
 
@@ -38262,9 +38006,6 @@ msgstr "Vælg midterpunkter"
 msgid "Please select two nodes connected by way!"
 msgstr "Vælg to punkter forbundet af vejen!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Alt for mange vej tilføjet: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Alt indenfor [tester]"
 
diff --git a/i18n/po/de.po b/i18n/po/de.po
index f499f37..762714b 100644
--- a/i18n/po/de.po
+++ b/i18n/po/de.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-28 20:52+0000\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-28 14:40+0000\n"
 "Last-Translator: holger (lp) <Unknown>\n"
 "Language-Team: JOSM\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:44+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:44+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: de\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -647,7 +647,7 @@ msgid "Join overlapping Areas"
 msgstr "Überlappende Gebiete verbinden"
 
 msgid "Joins areas that overlap each other"
-msgstr "Sich überlappende Gebiete miteinander verbinden"
+msgstr "Verbindet sich überlappende Gebiete"
 
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
@@ -1054,8 +1054,8 @@ msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 "Bitte geben Sie eine Adresse ein, von der Daten heruntergeladen werden sollen"
 
-msgid "Separate Layer"
-msgstr "Separate Ebene"
+msgid "Download as new layer"
+msgstr "Als neue Ebene laden"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr ""
@@ -2501,19 +2501,17 @@ msgstr "In GPX-Ebene konvertieren, beginnend mit letztem Element"
 
 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 ""
 "Diese Relation rekursiv zu einer einzelnen GPX-Spur vereinfachen, beginnend "
-"mit dem ersten Element bzw. den ersten Elementen, fortlaufend bis zum "
-"letzten Element bzw. zu den letzten Elementen."
+"mit dem ersten Element, fortlaufend bis zum letzten Element."
 
 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 ""
 "Diese Relation rekursiv zu einer einzelnen GPX-Spur vereinfachen, beginnend "
-"mit dem letzten Element bzw. den letzten Elementen, fortlaufend bis zum "
-"ersten Element bzw. zu den ersten Elementen."
+"mit dem letzten Element, fortlaufend bis zum ersten Element."
 
 msgid "Selected Relations"
 msgstr "Ausgewählte Relationen"
@@ -9104,9 +9102,6 @@ msgstr "Als Breitengrad wird ein Wert im Intervall [-90,90] erwartet."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Als Längengrad wird ein Wert im Intervall [-180,180] erwartet."
 
-msgid "Download as new layer"
-msgstr "Als neue Ebene laden"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10821,6 +10816,9 @@ msgstr "Keine Daten in Datei ''{0}'' gefunden."
 msgid "Open OSM file"
 msgstr "OSM-Datei öffnen"
 
+msgid "OSM Server Files XZ compressed"
+msgstr "OSM-Serverdateien (xz-komprimiert)"
+
 msgid "Validation Error Files"
 msgstr "Prüffehler-Datei"
 
@@ -10934,7 +10932,7 @@ msgstr ""
 "anhand von GPS-Spuren den Versatz!"
 
 msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
-msgstr "http://wiki.openstreetmap.org/wiki/Using_Imagery"
+msgstr "https://wiki.openstreetmap.org/wiki/DE:Luftbilder_verwenden"
 
 msgid "Details..."
 msgstr "Details …"
@@ -14241,9 +14239,6 @@ msgstr "Fernsteuerung"
 msgid "Settings for the remote control feature."
 msgstr "Einstellungen für die Fernsteuerungsfunktion."
 
-msgid "Download objects to new layer"
-msgstr "Objekte in neue Ebene herunterladen"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Alle Fernsteuerungsaktionen manuell bestätigen"
 
@@ -16231,6 +16226,12 @@ msgstr "Erweiterung behalten"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Klicken Sie, um die Erweiterung \"{0}\" zu behalten"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Installation der Erweiterung {0} aus der temporären Datei ''{1}'' ist "
+"fehlgeschlagen. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Entfernen der veralteten Erweiterung {0} ist fehlgeschlagen."
 
@@ -16242,12 +16243,6 @@ msgstr ""
 "wird weiterhin die alte Version der Erweiterung nutzen."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Installation der Erweiterung {0} aus der temporären Datei ''{1}'' ist "
-"fehlgeschlagen. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -18266,10 +18261,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "Hausdach"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "Kiosk"
-
 msgid "Start date"
 msgstr "Startdatum"
 
@@ -19786,6 +19777,9 @@ msgstr "Bio Diesel"
 msgid "Octane 80"
 msgstr "80 Oktan"
 
+msgid "Octane 87"
+msgstr "87 Oktan"
+
 msgid "Octane 91"
 msgstr "Normalbenzin (91)"
 
@@ -19807,6 +19801,9 @@ msgstr "E10 (10% Ethanol Gemisch)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol Gemisch)"
 
+msgid "Ethanol (alcohol)"
+msgstr "Ethanol (Alkohol)"
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Flüssiggas)"
 
@@ -22464,6 +22461,12 @@ msgstr "Springbrunnen"
 msgid "Water Well"
 msgstr "Brunnen"
 
+msgid "Pump"
+msgstr "Pumpe"
+
+msgid "powered"
+msgstr "maschinell"
+
 msgid "Lighthouse"
 msgstr "Leuchtturm"
 
@@ -25574,6 +25577,38 @@ msgstr "OpenSnowMap-Einblendung"
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr "Einblendung für Pisten-Kartierung in OSM. Täglich aktualisiert."
 
+msgid "OpenRailwayMap"
+msgstr "OpenRailwayMap"
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr "Einblendung für Eisenbahn-Kartierung in OSM"
+
+msgid "OpenInfraMap Telecoms"
+msgstr "OpenInfraMap Telekommunikation"
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Einblendung für Telekommunikations-Infrastruktur-Kartierung in OSM. Täglich "
+"aktualisiert."
+
+msgid "OpenInfraMap Power"
+msgstr "OpenInfraMap Energie"
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Einblendung für Energie-Infrastruktur-Kartierung in OSM. Täglich "
+"aktualisiert."
+
+msgid "OpenInfraMap Petroleum"
+msgstr "OpenInfraMap Erdöl"
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Einblendung für Erdöl-Infrastruktur-Kartierung in OSM. Täglich aktualisiert."
+
 msgid "skobbler"
 msgstr "skobbler"
 
@@ -25656,9 +25691,8 @@ msgstr "OSM-Inspektor: Adressen"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM-Inspektor: Küstenlinie (EU)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Albanische Alpen (Prokletije)"
+msgid "imagico.de: Prokletije Mountains"
+msgstr "imagico.de: Albanische Alpen (Prokletije)"
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
@@ -25676,10 +25710,8 @@ msgstr ""
 "Straßen & Gebäude, die von der Gemeinde Tirana zur Verfügung gestellt und "
 "von Open Labs gehostet werden"
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Südliches Transantarktisches "
-"Gebirge"
+msgid "imagico.de: Southern Transantarctic Mountains"
+msgstr "imagico.de: Südliches Transantarktisches Gebirge"
 
 msgid ""
 "Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
@@ -25688,24 +25720,45 @@ msgstr ""
 "Außerhalb der normalen Landsat-Abdeckung und daher nicht in LIMA und "
 "Bing/Mapbox (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
-msgstr "imagico.de OSM Bilder für die Kartierung: 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 Bilder für die Kartierung: 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 ""
 "Ziemlich klare aktuelle Bilder für die Aktualisierung der Gletscherkanten "
 "(Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
-msgstr "imagico.de OSM Bilder für die Kartierung: Enderbyland und Kemp-Küste"
+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: Enderbyland und Kemp-Küste"
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr "Sentinel-2 Bilder von Enderbyland und Kemp-Küste (Echtfarben)"
 
+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 topografische Karte (TMS)"
 
@@ -25844,14 +25897,14 @@ msgstr "Ministerium für Agrarindustrie (WMS)"
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr "Ministerium für Energie und Bergbau (WMS)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
-msgstr "imagico.de OSM Bilder für Mapping: Bahía Blanca (Ebbe)"
+msgid "imagico.de: Bahía Blanca (low tide)"
+msgstr "imagico.de: Bahía Blanca (Ebbe)"
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr "Watt und Inseln an der Küste (echte Farben)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
-msgstr "imagico.de OSM Bilder für Mapping: Bahía Blanca (Flut)"
+msgid "imagico.de: Bahía Blanca (high tide)"
+msgstr "imagico.de: Bahía Blanca (Flut)"
 
 msgid "AGRI black-and-white 2.5m"
 msgstr "AGRI Schwarzweiß 2.5m"
@@ -25883,9 +25936,8 @@ msgstr "LPI NSW Verwaltungsgrenzen Staatsforst"
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW Verwaltungsgrenzen NPWS-Schutzgebiet"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Nordwestlicher Teil der Insel Heard"
+msgid "imagico.de: Northwest Heard Island"
+msgstr "imagico.de: Nordwestlicher Teil der Insel Heard"
 
 msgid ""
 "Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
@@ -25893,8 +25945,8 @@ msgstr ""
 "Gletscher der nordwestlichen Heard-Insel (inzwischen kartiert) (Falschfarben "
 "Infrarot)"
 
-msgid "imagico.de OSM images for mapping: Heard Island coast"
-msgstr "imagico.de OSM Bilder für die Kartierung: Küste Insel Heard"
+msgid "imagico.de: Heard Island coast"
+msgstr "imagico.de: Küste Insel Heard"
 
 msgid ""
 "Recent image of Heard island with interior mostly cloud covered but mostly "
@@ -25963,8 +26015,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 Bilder für die Kartierung: Rila- und Pirin-Gebirge"
+msgid "imagico.de: Rila and Pirin Mountains"
+msgstr "imagico.de: Rila- und Pirin-Gebirge"
 
 msgid "OpenStreetMap (Belgian Style)"
 msgstr "OpenStreetMap (Belgischer Stil)"
@@ -26052,15 +26104,15 @@ msgstr "TEC-Bushaltestellen"
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "Benin: Großraum Cotonou 2016"
 
-msgid "imagico.de OSM images for mapping: Cotonou"
-msgstr "imagico.de OSM Bilder für die Kartierung: Cotonou"
+msgid "imagico.de: Cotonou"
+msgstr "imagico.de: Cotonou"
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 "Lückenhaft und teilweise bewölkte Abdeckung in üblichen Quellen (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
-msgstr "imagico.de OSM Bilder für die Kartierung: Bouvetinsel"
+msgid "imagico.de: Bouvet Island"
+msgstr "imagico.de: Bouvetinsel"
 
 msgid "For more accurate coastline and glacier mapping (true color)"
 msgstr "Für genauere Küsten- und Gletscherkartierung (Echtfarben)"
@@ -26231,15 +26283,14 @@ msgstr "Hochwertige Luftbilder für die Stadt Kelowna"
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna-Straßeneinblendung"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Östliche Küste Devon Island"
+msgid "imagico.de: Eastern Devon Island coast"
+msgstr "imagico.de: Östliche Küste Devon Island"
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr "Inzwischen zum Großteil kartierte Küste (Falschfarbe Infrarot)"
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
-msgstr "imagico.de OSM Bilder für die Kartierung: Nördliche Ellesmere-Insel"
+msgid "imagico.de: Northern Ellesmere Island"
+msgstr "imagico.de: Nördliche Ellesmere-Insel"
 
 msgid ""
 "Assembled from July 2012 ASTER imagery (true color with estimated blue)"
@@ -26247,10 +26298,8 @@ msgstr ""
 "Zusammengestellt aus ASTER Luftbildern von Juli 2012 (Echtfarben mit "
 "berechnetem Blau)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Nördliche Ellesmere-Insel Juli 2016"
+msgid "imagico.de: Northern Ellesmere Island July 2016"
+msgstr "imagico.de: Nördliche Ellesmere-Insel Juli 2016"
 
 msgid ""
 "Assembled from July 2016 ASTER imagery (true color with estimated blue)"
@@ -26258,14 +26307,14 @@ msgstr ""
 "Zusammengestellt aus ASTER Luftbildern von Juli 2016 (Echtfarben mit "
 "berechnetem Blau)"
 
-msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
-msgstr "imagico.de OSM Bilder für die Kartierung: Fogo, Kap Verde"
+msgid "imagico.de: Fogo, Cape Verde"
+msgstr "imagico.de: Fogo, Kap Verde"
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr "Bild von nach dem Ausbruch 2014/2015 (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
-msgstr "imagico.de OSM Bilder für die Kartierung: Insel Londonderry"
+msgid "imagico.de: Isla Londonderry"
+msgstr "imagico.de: Insel Londonderry"
 
 msgid ""
 "A lot of very coarse coastlines could be improved here, much snow cover "
@@ -26275,8 +26324,8 @@ msgstr ""
 "hohe Schneebedeckung, daher nicht zur Kartierung von Gletschern nutzbar "
 "(Falschfarben Infrarot)"
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
-msgstr "imagico.de OSM Bilder für die Kartierung: Vulkan Calbuco"
+msgid "imagico.de: Volcán Calbuco"
+msgstr "imagico.de: Vulkan Calbuco"
 
 msgid "Image from after the 2015 eruption (true color)"
 msgstr "Bild von nach dem Ausbruch 2015 (Echtfarben)"
@@ -26323,8 +26372,8 @@ msgstr "Stevns"
 msgid "Vejmidte"
 msgstr "Vejmidte"
 
-msgid "imagico.de OSM images for mapping: El Altar"
-msgstr "imagico.de OSM Bilder für die Kartierung: El Altar"
+msgid "imagico.de: El Altar"
+msgstr "imagico.de: El Altar"
 
 msgid ""
 "2007 ASTER image offering better glacier coverage than common sources (true "
@@ -26333,9 +26382,8 @@ msgstr ""
 "2007er ASTER Bild mit besserer Gletscherabdeckung als die üblichen Quellen "
 "(Echtfarben mit berechnetem Blau)"
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Inseln Darwin und Wolf, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
+msgstr "imagico.de: Inseln Darwin und Wolf, Galapagos"
 
 msgid ""
 "Recent image, only old and poor images in other sources currently (true "
@@ -26508,11 +26556,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 Bilder für die Kartierung: Nördliches deutsches Westküsten-"
-"Watt"
+msgid "imagico.de: Northern German west coast tidalflats"
+msgstr "imagico.de: Nördliches deutsches Westküsten-Watt"
 
 msgid ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
@@ -26521,12 +26566,8 @@ msgstr ""
 "Aktuelle Luftbilder der Küste bei Ebbe zur Aktualisierung des Watts und "
 "seichter Stellen (Echtfarben)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Nördliches deutsches Westküsten-"
-"Watt (Infrarot)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
+msgstr "imagico.de: Nördliches deutsches Westküsten-Watt (Infrarot)"
 
 msgid ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
@@ -26535,11 +26576,11 @@ msgstr ""
 "Aktuelle Luftbilder der Küste bei Ebbe zur Aktualisierung des Watts und "
 "seichter Stellen (Falschfarben Infrarot)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr "imagico.de OSM-Bilder zum Kartieren: Nordseeküste 2016"
+msgid "imagico.de: North Sea Coast 2016"
+msgstr "imagico.de: Nordseeküste 2016"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
-msgstr "imagico.de OSM Bilder für Mapping: Nordseeküste 2017"
+msgid "imagico.de: North Sea Coast 2017"
+msgstr "imagico.de: Nordseeküste 2017"
 
 msgid "Saxony latest aerial imagery"
 msgstr "Sachsen Luftbild aktuell"
@@ -26571,27 +26612,27 @@ msgstr "Mainz neuestes Luftbild"
 msgid "Munich latest aerial imagery 60cm"
 msgstr "München neuestes Luftbild 60cm"
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
-msgstr "imagico.de OSM Bilder für die Kartierung: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
+msgstr "imagico.de: Qasigiannguit"
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr "IceBridge DMS Bild der Siedlung - Ausrichtung kann schlecht sein"
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
-msgstr "imagico.de OSM Bilder für die Kartierung: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
+msgstr "imagico.de: Thule Air Base"
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr "IceBridge DMS Bild - Ausrichtung kann schlecht sein"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
-msgstr "imagico.de OSM Bilder für Mapping: Kangerlussuaq Herbst"
+msgid "imagico.de: Kangerlussuaq Autumn"
+msgstr "imagico.de: Kangerlussuaq Herbst"
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr "Icebridge DMS Bilder vom Flughafen und der Siedlung"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
-msgstr "imagico.de OSM Bilder für Mapping: Kangerlussuaq Frühling"
+msgid "imagico.de: Kangerlussuaq Spring"
+msgstr "imagico.de: Kangerlussuaq Frühling"
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
@@ -26599,41 +26640,29 @@ msgstr ""
 "Icebridge DMS Bilder vom Flughafen und der Straßen - Ausrichtung eventuell "
 "schlecht"
 
-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 OSM Bilder für die Kartierung: Thule Air Base DMS Überflug in "
-"niedriger Höhe September 2015"
+"imagico.de: Thule Air Base DMS Überflug in niedriger Höhe September 2015"
 
 msgid ""
 "Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
 msgstr ""
 "IceBridge DMS Luftbilder der Thule Air Base - Ausrichtung kann schlecht sein"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
-"2015"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Thule Air Base DMS Überflug "
-"September 2015"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
+msgstr "imagico.de: Thule Air Base DMS Überflug September 2015"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Thule Air Base DMS Überflug "
-"Oktober 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
+msgstr "imagico.de: Thule Air Base DMS Überflug Oktober 2015"
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
-msgstr "imagico.de OSM Bilder für die Kartierung: Grönland"
+msgid "imagico.de: Greenland mosaic"
+msgstr "imagico.de: Grönland"
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr "Landsat-Mosaik von Grönland (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Mai 2013 seitlich aufgenommen (off-"
-"nadir) Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
+msgstr "imagico.de: Mai 2013 seitlich aufgenommen (off-nadir) Landsat"
 
 msgid ""
 "First available image north of the regular Landsat limit, mostly with "
@@ -26642,16 +26671,14 @@ msgstr ""
 "Erstes verfügbares Bild nördlich der regulären Landsat-Grenze, meist mit "
 "saisonaler Schneedecke, daher schwer zu interpretieren (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Landsat seitlich aufgenommen (off-"
-"nadir) Juli 2016"
+msgid "imagico.de: Landsat off-nadir July 2016"
+msgstr "imagico.de: Landsat seitlich aufgenommen (off-nadir) Juli 2016"
 
 msgid "Latest images north of the regular Landsat limit (true color)"
 msgstr "Neueste Bilder nördlich der regulären Landsat-Grenze (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
-msgstr "imagico.de OSM Bilder für die Kartierung: Nördliches Grönland ASTER"
+msgid "imagico.de: Northern Greenland ASTER"
+msgstr "imagico.de: Nördliches Grönland ASTER"
 
 msgid ""
 "Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
@@ -26720,14 +26747,14 @@ msgstr "OpenStreetMap Hungary (Wanderwege)"
 msgid "Hillshade Hungary"
 msgstr "Schummerung Ungarn"
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
-msgstr "imagico.de OSM Bilder für die Kartierung: Östliches Island"
+msgid "imagico.de: Eastern Iceland"
+msgstr "imagico.de: Östliches Island"
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr "Fehlende kleine Inseln und ungenaue Küste (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
-msgstr "imagico.de OSM Bilder für die Kartierung: Rann von Kachchh"
+msgid "imagico.de: Rann of Kutch"
+msgstr "imagico.de: Rann von Kachchh"
 
 msgid ""
 "Land/water distinction difficult to properly map based on Bing/Mapbox images "
@@ -26736,8 +26763,8 @@ msgstr ""
 "Land/Wasser Unterscheidung ist schwierig um richtig zu kartieren basierend "
 "auf Bing/Mapbox Bildern (Falschfarben Infrarot)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
-msgstr "imagico.de OSM Bilder für Mapping: Sudirman-Gebirge 2015"
+msgid "imagico.de: Sudirman Range 2015"
+msgstr "imagico.de: Sudirman-Gebirge 2015"
 
 msgid ""
 "Older image of the Sudirman Range with no fresh snow showing glacier extent "
@@ -26746,8 +26773,8 @@ msgstr ""
 "Ältere Bilder des Sudirman-Gebirges ohne Neuschnees, welcher die Ausmaße des "
 "Gletschers zeigt."
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
-msgstr "imagico.de OSM Bilder für die Kartierung: Südöstliches Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
+msgstr "imagico.de: Südöstliches Sulawesi"
 
 msgid ""
 "Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
@@ -26756,20 +26783,20 @@ msgstr ""
 "Fehlende Inseln und grobe Küstenlinie durch Wolkendecke in Bing, Seen "
 "könnten auch zusätzliche Details vertragen (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
-msgstr "imagico.de OSM Bilder für die Kartierung: Bakun-Stausee"
+msgid "imagico.de: Bakun Reservoir"
+msgstr "imagico.de: Bakun-Stausee"
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr "In älteren Bildern vor 2011 fehlend (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Batam"
-msgstr "imagico.de OSM Bilder für die Kartierung: Batam"
+msgid "imagico.de: Batam"
+msgstr "imagico.de: Batam"
 
 msgid "Missing Islands in OSM (true color)"
 msgstr "Fehlende Inseln in OSM (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
-msgstr "imagico.de OSM Bilder für Mapping: Sudirman-Gebirge 2016"
+msgid "imagico.de: Sudirman Range 2016"
+msgstr "imagico.de: Sudirman-Gebirge 2016"
 
 msgid ""
 "Cloud free image of the Sudirman Range but with fresh snow (true color)"
@@ -26875,14 +26902,14 @@ msgstr "Japan GSI Luftbild"
 msgid "Japan GSI Standard Map"
 msgstr "Japan GSI Standardkarte"
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
-msgstr "imagico.de OSM Bilder für Mapping: Aralsee (niedriger Wasserstand)"
+msgid "imagico.de: Aral Sea (low water level)"
+msgstr "imagico.de: Aralsee (niedriger Wasserstand)"
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr "Wasser und Feuchtgebiet-Ausmaße, Dämme etc. (echte Farben)"
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
-msgstr "imagico.de OSM Bilder für Mapping: Aralsee (hoher Wasserstand)"
+msgid "imagico.de: Aral Sea (high water level)"
+msgstr "imagico.de: Aralsee (hoher Wasserstand)"
 
 msgid ""
 "Water and wetland extents, dams etc. - some remaining winter ice in the "
@@ -26891,8 +26918,8 @@ msgstr ""
 "Wasser und Feuchtgebiet-Ausmaße, Dämme etc. - einiges, übergebliebenes "
 "Winter-Eis im Norden (echte Farben)"
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
-msgstr "imagico.de OSM Bilder für die Kartierung: Mount-Kenya-Massiv 2016"
+msgid "imagico.de: Mount Kenya 2016"
+msgstr "imagico.de: Mount-Kenya-Massiv 2016"
 
 msgid "Up-to-date image for glacier mapping (true color)"
 msgstr "Aktuelles Bild für Gletscher-Kartierung (Echtfarben)"
@@ -26997,15 +27024,6 @@ msgid ""
 msgstr ""
 "Offizielle norwegische Ortsnamen aus der SSR-Datenbank. Wählbare Kategorien."
 
-msgid "MTBmap.no"
-msgstr "MTBmap.no"
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-"Norwegische Mountainbikekarte von OSM (maximaler Zoom 14-16, variiert je "
-"nach Region)"
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr "Kartverket DTM Digitales Geländemodell"
 
@@ -27116,6 +27134,22 @@ msgid ""
 msgstr ""
 "Förderplattformen und Erdöl-/Erdgasfelder auf dem norwegischen Festlandsockel"
 
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr "Kystverket Navigationshilfen-Einblendung"
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+"Baken, Bojen, Lichter und Fahrrinnen, die von der norwegischen "
+"Küstenverwaltung unterhalten werden."
+
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr "Einblendung der Schutzgebiete des Norwgischen Umweltministeriums"
 
@@ -27126,6 +27160,37 @@ msgstr ""
 "Norwegische Nationalparks, Naturreservate und andere geschützte Bereiche und "
 "Objekte von Naturbase, inklusive Svalbard/Spitzbergen"
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr "Riksantikvaren Kulturerbestätten-Einblendung"
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+"Gesetzlich geschützte archäologische und architektonische Denkmäler/Stätten "
+"und Kulturlandschaften (\"enkeltminner\") des norwegischen Direktorat für "
+"Kulturerbe"
+
+msgid "SSB Urban Areas overlay"
+msgstr "SSB städtische Gebiete Einblendung"
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+"Siedlungen von mindestens 200 Personen mit weniger als 200 Metern Abstand "
+"zwischen den Haushalten."
+
+msgid "MTBmap.no"
+msgstr "MTBmap.no"
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+"Norwegische Mountainbikekarte von OSM (maximaler Zoom 14-16, variiert je "
+"nach Region)"
+
 msgid "NP Svalbard Orthophoto"
 msgstr "NP Orthophoto Spitzbergen"
 
@@ -27133,15 +27198,14 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr "Orthophoto von Spitzbergen vom Norwegischen Polar Institut"
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
-msgstr "imagico.de OSM-Bilder zum Kartieren: Spitzbergen-Mosaik"
+msgid "imagico.de: Svalbard mosaic"
+msgstr "imagico.de: Spitzbergen-Mosaik"
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr "Sentinel-2 Mosaik von Svalbard (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Westliches Karakorum-Gebirge"
+msgid "imagico.de: Western Karakoram"
+msgstr "imagico.de: Westliches Karakorum-Gebirge"
 
 msgid ""
 "Represents approximately minimum snow cover so can be well used for glacier "
@@ -27156,9 +27220,8 @@ msgstr "Gazastreifen - Pléiades - 2014/07/06"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Gazastreifen - Pléiades - 2014/07/06 (Nahinfrarot)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Panamakanal - pazifische Seite"
+msgid "imagico.de: Panama Canal - Pacific side"
+msgstr "imagico.de: Panamakanal - pazifische Seite"
 
 msgid ""
 "New locks with less clouds than in the Sentinel-2 image - make sure to check "
@@ -27167,36 +27230,33 @@ msgstr ""
 "Neue Absperrungen mit weniger Wolken als im Sentinel-2-Bild - überprüfen Sie "
 "die Bildausrichtung (echte Farben)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
-msgstr "imagico.de OSM Bilder für die Kartierung: Panamakanal"
+msgid "imagico.de: Panama Canal"
+msgstr "imagico.de: Panamakanal"
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 "Bilder der neuen Absperrungen (aber teilweise bewölkt) (echte Farben)"
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
-msgstr "imagico.de OSM Bilder für die Kartierung: Vanatinai"
+msgid "imagico.de: Vanatinai"
+msgstr "imagico.de: Vanatinai"
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 "Grobe Küstenlinie aufgrund von Bewölkung in Bing/Mapbox (echte Farben)"
 
-msgid "imagico.de OSM images for mapping: New Ireland"
-msgstr "imagico.de OSM Bilder für die Kartierung: Neuirland"
+msgid "imagico.de: New Ireland"
+msgstr "imagico.de: Neuirland"
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 "Viele fehlende Inseln in OSM (mittlerweile größtenteils kartiert) "
 "(Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Coropuna"
-msgstr "imagico.de OSM Bilder für die Kartierung: 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-Bilder für die Kartierung: Vilcanota-Kordillere und Quelccaya-"
-"Eiskappe"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr "imagico.de: Vilcanota-Kordillere und Quelccaya-Eiskappe"
 
 msgid "Poor and outdated imagery in other sources (true color)"
 msgstr "Schlechte und veraltete Bilder bei anderen Quellen (Echtfarben)"
@@ -27264,8 +27324,11 @@ msgstr "Katowice: Gebäude"
 msgid "Łódź: Buildings"
 msgstr "Łódź: Gebäude"
 
-msgid "Łódź: Orthophotomap (aerial image)"
-msgstr "Łódź: Orthofoto"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr "Lodz: Orthophotokarte 2015 (Luftbild)"
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
+msgstr "Lodz: Orthophotokarte 2017 (Luftbild)"
 
 msgid "Powiat dębicki: Buildings"
 msgstr "Powiat dębicki: Gebäude"
@@ -27297,6 +27360,12 @@ msgstr "Powiat stalowowolski: Gebäude"
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr "Poznań: Orthofoto 2014"
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr "Poznań: Orthofoto 2016"
+
+msgid "Poznań: Buildings"
+msgstr "Posen: Gebäude"
+
 msgid "Przemyśl: Buildings"
 msgstr "Przemyśl: Gebäude"
 
@@ -27345,37 +27414,33 @@ msgstr "ScanEx IRS"
 msgid "ScanEx SPOT"
 msgstr "ScanEx SPOT"
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
-msgstr "imagico.de OSM Bilder für die Kartierung: Straße von Kertsch"
+msgid "imagico.de: Kerch Strait"
+msgstr "imagico.de: Straße von Kertsch"
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr "In Bau befindliche Brücke im August 2016 (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr "imagico.de OSM-Bilder zum Kartieren: Petschoraseeküste"
+msgid "imagico.de: Pechora Sea Coast"
+msgstr "imagico.de: Petschoraseeküste"
 
 msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
 msgstr ""
 "Sentinel-2-Bild der Petschora-Meeresküste im Herbst 2016 (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
-msgstr "imagico.de OSM Bilder für die Kartierung: Uschakow-Insel August 2016"
+msgid "imagico.de: Ushakov Island August 2016"
+msgstr "imagico.de: Uschakow-Insel August 2016"
 
 msgid "Up-to-date late summer imagery with few clouds (true color)"
 msgstr "Aktuelle Spätsommerbilder mit wenigen Wolken (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Northern Dvina delta at low tide"
-msgstr "imagico.de OSM Bilder für Mapping: Nördliches Dwina-Delta bei Ebbe"
+msgid "imagico.de: Northern Dvina delta at low tide"
+msgstr "imagico.de: Nördliches Dwina-Delta bei Ebbe"
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr "Strände, Watt und andere Küstenformationen (echte Farben)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
-msgstr ""
-"imagico.de OSM Bilder für die Kartierung: Nördlicher und polarer Ural August "
-"2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
+msgstr "imagico.de: Nördlicher und polarer Ural August 2016"
 
 msgid ""
 "Up-to-date late summer imagery with few clouds - caution: not all visible "
@@ -27384,8 +27449,8 @@ msgstr ""
 "Aktuelle Spätsommerbilder mit wenigen Wolken - Achtung: Nicht jeder "
 "sichtbare Schnee gehört zu Gletschern (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
-msgstr "imagico.de OSM Bilder für die Kartierung: Kosmodrom Wostotschny"
+msgid "imagico.de: Vostochny Cosmodrome"
+msgstr "imagico.de: Kosmodrom Wostotschny"
 
 msgid "Recent image showing newest features (true color)"
 msgstr "Neues Bild mit den neuesten Eigenschaften (Echtfarben)"
@@ -27434,27 +27499,27 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial (Luftbild)"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
-msgstr "imagico.de OSM Bilder für die Kartierung: Leskov Island ASTER"
+msgid "imagico.de: Leskov Island ASTER"
+msgstr "imagico.de: Leskov Island ASTER"
 
 msgid "Missing in other image sources (true color with estimated blue)"
 msgstr ""
 "In anderen Bildquellen nicht vorhanden (Echtfarben mit berechnetem Blau)"
 
-msgid "imagico.de OSM images for mapping: Scott Island"
-msgstr "imagico.de OSM Bilder für die Kartierung: Scott-Insel"
+msgid "imagico.de: Scott Island"
+msgstr "imagico.de: Scott-Insel"
 
 msgid "Missing in other image sources (true color)"
 msgstr "Fehlt bei anderen Bildquellen (Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
-msgstr "imagico.de OSM Bilder für die Kartierung: Leskov Island Landsat"
+msgid "imagico.de: Leskov Island Landsat"
+msgstr "imagico.de: Leskov Island Landsat"
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
-msgstr "imagico.de OSM Bilder für die Kartierung: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
+msgstr "imagico.de: Clerke Rocks"
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
-msgstr "imagico.de OSM Bilder für die Kartierung: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
+msgstr "imagico.de: Shag Rocks"
 
 msgid "Catastro Spain"
 msgstr "Catastro Spain"
@@ -27477,8 +27542,8 @@ msgstr "IDEIB - Balearische Inseln"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Kanarische Inseln"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
-msgstr "imagico.de OSM Bilder für die Kartierung: Adamsbrücke"
+msgid "imagico.de: Adams Bridge"
+msgstr "imagico.de: Adamsbrücke"
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr ""
@@ -27574,10 +27639,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 Bilder für die Kartierung: Zentrale Alpen später September "
-"2016"
 
 msgid ""
 "Up-to-date image for glacier mapping - beware of some fresh snow at higher "
@@ -27586,6 +27649,13 @@ msgstr ""
 "Aktuelles Bild für Gletscher-Kartierung - Vorsicht vor frischem Schnee in "
 "höheren Lagen (Echtfarben)"
 
+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"
 
@@ -27606,8 +27676,8 @@ msgstr "Taiwan Parzellendaten"
 msgid "NLSC Open Data WMTS"
 msgstr "NLSC Open Data WMTS"
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
-msgstr "imagico.de OSM Bilder für die Kartierung: Kilimandscharo 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
+msgstr "imagico.de: Kilimandscharo 2016"
 
 msgid "Aşgabat (high resolution)"
 msgstr "Aschgabat (hohe Auflösung)"
@@ -27679,8 +27749,8 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "U.S. Waldwege"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
-msgstr "imagico.de OSM Bilder für die Kartierung: Alaskakette"
+msgid "imagico.de: Alaska Range"
+msgstr "imagico.de: Alaskakette"
 
 msgid ""
 "Recent summer image of the Alaska Range for mapping natural features (true "
@@ -27689,14 +27759,14 @@ msgstr ""
 "Neuestes Sommerbild der Alaskakette zur Kartierung natürliche Eigenschaften "
 "(Echtfarben)"
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
-msgstr "imagico.de OSM Bilder für Mapping: Bogoslof-Insel"
+msgid "imagico.de: Bogoslof Island"
+msgstr "imagico.de: Bogoslof-Insel"
 
 msgid "Recent image from after the eruption (true color)"
 msgstr "Neues Foto nach einem Ausbruch (echte Farben)"
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
-msgstr "imagico.de OSM Bilder für Mapping: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
+msgstr "imagico.de: Cook Inlet"
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
 msgstr "Watt und Gletscher in umliegenden Gebirgen (echte Farben)"
@@ -27794,8 +27864,16 @@ msgstr ""
 "Band Echtfarben und nahes Infrarot (R, G, B, IR), und deckt New Castle, Kent "
 "und Sussex Counties im Bundesstaat Delaware ab."
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
-msgstr "imagico.de OSM Bilder für die Kartierung: Ruwenzori-Gebirge"
+msgid "NYS Orthos Online"
+msgstr "NYS Orthofoto Online"
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+"Hochauflösende digitale Orthofotos des Bundesstaates New York, Auflösung 30cm"
+
+msgid "imagico.de: Rwenzori Mountains"
+msgstr "imagico.de: Ruwenzori-Gebirge"
 
 msgid ""
 "Recent image of most of the remaining Rwenzori Mountains glaciers (false "
@@ -27804,8 +27882,8 @@ msgstr ""
 "Neuestes Bild des Großteils der restlichen Ruwenzori-Gebirge-Gletscher "
 "(Falschfarben Infrarot)"
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
-msgstr "imagico.de OSM Bilder für die Kartierung: Ruwenzori-Gebirge 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
+msgstr "imagico.de: Ruwenzori-Gebirge 2016"
 
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophotomaps 2012"
@@ -27820,6 +27898,12 @@ msgstr "Ukraine - Kiew 2014 (DZK)"
 msgid "7th Series (OS7)"
 msgstr "7. Serie (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr "Hampshire Luftbild (Falschfarben Infrarot)"
+
+msgid "Hampshire Aerial RGB"
+msgstr "Hampshire Luftbild (Echtfarben)"
+
 msgid "OS New Popular Edition historic"
 msgstr "OS New Popular Edition historic"
 
@@ -28884,7 +28968,7 @@ msgid "Building inside building"
 msgstr "Gebäude im Gebäude"
 
 msgid "Overlapping Water Areas"
-msgstr "Uberlappende Wasserflächen"
+msgstr "Überlappende Wasserflächen"
 
 msgid "Overlapping Areas"
 msgstr "Überlappende Gebiete"
@@ -28976,7 +29060,7 @@ msgstr "{0} zusammen mit {1}"
 
 msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
 msgstr ""
-"{0} ist veraltet, dafür {1} benutzen. Siehe auch ähnliche Merkmale wie {2}"
+"{0} ist veraltet, dafür {1} benutzen. Prüfe auch ähnliche Merkmale wie {2}"
 
 msgid ""
 "Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
@@ -29009,51 +29093,45 @@ msgstr "{0} sollte ein Ganzzahlwert zwischen -5 und 5 sein"
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr "{0} sollte nur Zahlen mit optionalen 0.5-Schritten aufweisen"
 
+msgid "unusual value of {0}: use . instead of , as decimal separator"
+msgstr ""
+"ungewöhnlicher Wert von {0}: nutze . anstelle von , als Dezimaltrennzeichen"
+
 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}: Standard ist Meter; Trennzeichen ist Punkt; wenn Einheiten, Leerzeichen "
-"vor Einheit"
+"ungewöhnlicher Wert von {0}: Meter ist Standard; Punkt ist "
+"Dezimaltrennzeichen; bei Einheiten setzte ein Leerzeichen vor die Einheit"
 
 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}: Standard ist Tonne; Trennzeichen ist Punkt; wenn Einheiten, Leerzeichen "
-"vor Einheit"
+"ungewöhnlicher Wert von {0}: Tonne ist Standard; Punkt ist "
+"Dezimaltrennzeichen; bei Einheiten setzte ein Leerzeichen vor die Einheit"
 
-msgid "unusual {0} format"
-msgstr "ungewöhnliches Format von {0}"
+msgid "unusual value of {0}"
+msgstr "ungewöhnlicher Wert von {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}: Standard ist Kilometer; Trennzeichen ist Punkt; wenn Einheiten, "
-"Leerzeichen vor Einheit"
+"ungewöhnlicher Wert von {0}: Kilometer ist Standard; Punkt ist "
+"Dezimaltrennzeichen; bei Einheiten setzte ein Leerzeichen vor die Einheit"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 "Spannung sollte in Volt ohne Einheitensymbol oder Leerzeichen angegeben "
 "werden"
 
-msgid "unusual {0} specification"
-msgstr "ungewöhnliche Spezifikation von {0}"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "Ungewöhnliche Spurweite; Einheit mm ohne Trennzeichen verwenden"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr "Ungewöhnliche Steigung; Bitte Angaben in Prozent/Grad oder up/down"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} muss eine Zahl sein"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} muss eine positive Ganzzahl sein"
 
-msgid "unusual value of {0}"
-msgstr "ungewöhnlicher Wert von {0}"
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr "{0} muss ein numerischer Wert sein, in Metern und ohne Einheiten"
 
@@ -29171,6 +29249,9 @@ msgstr "Symbole bei niedrigen Zoomstufen ausblenden"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Weniger aufdringliche Punktsymbole bei niedrigen Zoomstufen"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr "Verstecke getaggte Knoten in niedrigem Zoom"
+
 msgid "Display street labels (at high zoom)"
 msgstr "Straßenbezeichnungen anzeigen (bei hohem Zoom)"
 
@@ -29230,6 +29311,9 @@ msgstr ""
 "Automatische Zuordnung der Adresse zu einem markieren Objekt in Österreich. "
 "Daten © Ö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."
@@ -29278,6 +29362,9 @@ msgstr ""
 "Implementiert eine Befehlszeile und ermöglicht das Erstellen Ihrer Befehle. "
 "Siehe Link für Standardbefehle (Bogen, Kreis, usw.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 "Werkzeug zum Zusammenführen von Daten (Übereinstimmungen finden und "
@@ -29336,6 +29423,13 @@ msgstr "Höhenprofil und statistische Daten einer GPX-Spur anzeigen."
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Bearbeitung von französischen EPCIs (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+"Stellt einen besseren Eventbus bereit als die traditionelle Listener "
+"Registrierung"
+
 msgid "Use external scripts in JOSM"
 msgstr "Externe Skript in JOSM nutzen"
 
@@ -29561,6 +29655,9 @@ msgstr ""
 "Erlaubt das Öffnen von GPX- oder OSM-Dateien, welche das aktuelle Gebiet "
 "schneiden."
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -30449,589 +30546,6 @@ msgstr "Importiere georeferenziertes Bild"
 msgid "Error while creating image layer: "
 msgstr "Fehler beim Erstellen der Bildebene: "
 
-msgid "Mapillary Images"
-msgstr "Mapillary Bilder"
-
-msgid "Mapillary layer"
-msgstr "Mapillary Ebene"
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr "{0} Sequenzen, jede enthält zwischen {1} und {2} Bilder (ø {3})"
-
-msgid "{0} imported images"
-msgstr "{0} importierte Bilder"
-
-msgid "{0} downloaded images"
-msgstr "{0} heruntergeladene Bilder"
-
-msgid "{0} images in total"
-msgstr "{0} Bilder insgesamt"
-
-msgid "{0} images in {1} sequences"
-msgstr "{0} Bilder in {1} Sequenzen"
-
-msgid "Mapillary object layer"
-msgstr "Mapillary-Objektebene"
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-"Zeigt die Ebene an, welche von Mapillary erkannte Kartenobjekte darstellt"
-
-msgid "Open Mapillary layer"
-msgstr "Mapillary-Einblendung öffnen"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Download Mapillary images in current view"
-msgstr "Mapillary-Bilder in aktueller Ansicht herunterladen"
-
-msgid "Export pictures"
-msgstr "Bilder exportieren"
-
-msgid "Export Mapillary pictures"
-msgstr "Mapillary-Bilder exportieren"
-
-msgid "Export images"
-msgstr "Bilder exportieren"
-
-msgid "Import pictures"
-msgstr "Bilder importieren"
-
-msgid "Import local pictures"
-msgstr "Lokale Bilder importieren"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Bilder in Mapillary-Ebene importieren"
-
-msgid "Join mode"
-msgstr "Verbindungsmodus"
-
-msgid "Join/unjoin pictures"
-msgstr "Bilder verbinden/trennen"
-
-msgid "Submit changeset"
-msgstr "Änderungssatz absenden"
-
-msgid "Submit the current changeset"
-msgstr "Aktuellen Änderungssatz absenden"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "Aktuellen Änderungssatz zu Mapillary absenden"
-
-msgid "rejected"
-msgstr "abgelehnt"
-
-msgid "pending"
-msgstr "ausstehend"
-
-msgid "approved"
-msgstr "genehmigt"
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr "{0} Bilder eingereicht, Änderungssatzschlüssel: {1}, Status: {2}"
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-"Hochladen des Änderungssatzes fehlgeschlagen mit {0} Fehler \"{1} {2}\"!"
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-"Bei der Übertragung eines Änderungssatzes ist ein Fehler aufgetreten. Falls "
-"dies wiederholt auftritt sollte der Fehler mittels Hilfe-Menu gemeldet "
-"werden. Wenn diese Nachricht zum ersten Mal erscheint, kann sie ignoriert "
-"werden. Es kann sich um ein Problem mit der Internetverbindung gehandelt "
-"haben."
-
-msgid "Upload Mapillary images"
-msgstr "Bilder zu Mapillary hochladen"
-
-msgid "Walk mode"
-msgstr "Spaziergangmodus"
-
-msgid "Zoom to selected image"
-msgstr "Auf ausgewähltes Bild zoomen"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Auf das aktuell ausgewählte Mapillary-Bild zoomen"
-
-msgid "Current Mapillary changeset"
-msgstr "Aktueller Mapillary-Änderungssatz"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Mapillary-Änderungssatzdialog öffnen"
-
-msgid "Mapillary changeset"
-msgstr "Mapillary-Änderungssatz"
-
-msgid "Submitting changeset to server…"
-msgstr "Änderungssatz wird an Server gesendet …"
-
-msgid "Export all images"
-msgstr "Alle Bilder exportieren"
-
-msgid "Export selected sequence"
-msgstr "Ausgewählte Sequenz exportieren"
-
-msgid "Export selected images"
-msgstr "Ausgewählte Bilder exportieren"
-
-msgid "Rewrite imported images"
-msgstr "Importierte Bilder neu schreiben"
-
-msgid "Select a directory"
-msgstr "Wählen Sie ein Verzeichnis aus"
-
-msgid "Explore"
-msgstr "Erkunden"
-
-msgid "Speed limit"
-msgstr "Geschwindigkeitsbegrenzung"
-
-msgid "Give way"
-msgstr "Vorfahrt gewähren"
-
-msgid "No entry"
-msgstr "Einfahrt verboten"
-
-msgid "Intersection danger"
-msgstr "Gefährliche Kreuzung"
-
-msgid "Mandatory direction (any)"
-msgstr "Vorgeschriebene Richtung (beliebig)"
-
-msgid "Uneven road"
-msgstr "Unebene Fahrbahn"
-
-msgid "No parking"
-msgstr "Parkverbot"
-
-msgid "No overtaking"
-msgstr "Überholverbot"
-
-msgid "Pedestrian crossing"
-msgstr "Fußgängerübergang"
-
-msgid "No turn"
-msgstr "Abbiegen verboten"
-
-msgid "Years"
-msgstr "Jahre"
-
-msgid "Months"
-msgstr "Monate"
-
-msgid "Days"
-msgstr "Tage"
-
-msgid "Imported images"
-msgstr "Importierte Bilder"
-
-msgid "Mapillary filter"
-msgstr "Mapillary-Filter"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Mapillary-Filterdialog öffnen"
-
-msgid "Not older than: "
-msgstr "Nicht älter als: "
-
-msgid "Downloaded images"
-msgstr "Heruntergeladene Bilder"
-
-msgid "Only images with signs"
-msgstr "Nur Bilder mit Zeichen"
-
-msgid "Choose signs"
-msgstr "Zeichen auswählen"
-
-msgid "Mapillary history"
-msgstr "Mapillary-Chronik"
-
-msgid "Open Mapillary history dialog"
-msgstr "Mapillary-Chronikdialog öffnen"
-
-msgid "No image selected"
-msgstr "Kein Bild ausgewählt"
-
-msgid "Press \"{0}\" to download images"
-msgstr "Zum Herunterladen von Bildern \"{0}\" drücken"
-
-msgid "Mapillary picture"
-msgstr "Mapillary-Bild"
-
-msgid "Open Mapillary window"
-msgstr "Mapillary Fenster öffnen"
-
-msgid "Next picture"
-msgstr "Nächstes Bild"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Zeigt das nächste Bild in der Sequenz an"
-
-msgid "Previous picture"
-msgstr "Vorheriges Bild"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Zeigt das vorherige Bild in der Sequenz an"
-
-msgid "Jump to red"
-msgstr "Zu Rot wechseln"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Wechselt zu dem Bild auf der anderen Seite der roten Linie"
-
-msgid "Jump to blue"
-msgstr "Zu Blau wechseln"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Wechselt zu dem Bild auf der anderen Seite der blauen Linie"
-
-msgid "Stops the walk."
-msgstr "Stoppt den Spaziergang."
-
-msgid "Play"
-msgstr "Wiedergabe"
-
-msgid "Continues with the paused walk."
-msgstr "Setzt den pausierten Spaziergang fort."
-
-msgid "Pause"
-msgstr "Pause"
-
-msgid "Pauses the walk."
-msgstr "Pausiert den Spaziergang."
-
-msgid "Display hour when the picture was taken"
-msgstr "Stunde, in der das Bild gemacht wurde, anzeigen"
-
-msgid "Use 24 hour format"
-msgstr "24-Stunden-Format verwenden"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-"Wechseln Sie zur Bildadresse mit den nächstes/vorheriges Schaltflächen"
-
-msgid "Preview images when hovering its icon"
-msgstr "Beim Überfahren des Symbols Vorschaubilder anzeigen"
-
-msgid "Cut off sequences at download bounds"
-msgstr "Schneide Sequenzen an den Herunterladegrenzen ab"
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-"Beim Öffnen eines Mapillary Bildes im Webbrowser den Unschärfe-Editor "
-"anstelle des Bildbetrachters anzeigen"
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr "Experimentelle Beta-Funktionalität aktivieren (kann instabil sein)"
-
-msgid "Download mode"
-msgstr "Herunterlademodus"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr "Anzahl der vorab abzurufenden Bilder (vorwärts und rückwärts)"
-
-msgid "You are logged in as ''{0}''."
-msgstr "Sie sind als ''{0}'' angemeldet."
-
-msgid "You are currently not logged in."
-msgstr "Sie sind momentan nicht angemeldet."
-
-msgid "Login"
-msgstr "Anmelden"
-
-msgid "Logout"
-msgstr "Abmelden"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-"Gehen Sie in die Einstellung und melden Sie sich vor dem Hochladen bei "
-"Mapillary an."
-
-msgid "Upload selected sequence"
-msgstr "Ausgewählte Sequenz hochladen"
-
-msgid "Delete after upload"
-msgstr "Nach dem Hochladen löschen"
-
-msgid "Wait for full quality pictures"
-msgstr "Warten Sie für Bilder in voller Qualität"
-
-msgid "Follow selected image"
-msgstr "Ausgewähltem Bild folgen"
-
-msgid "Go forward"
-msgstr "Vorwärts gehen"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr "Welche Bildebenen möchten Sie in die Mapillary-Ebene importieren?"
-
-msgid "Import"
-msgstr "Importieren"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-"Konnte ein georeferenziertes Bild nicht in die Mapillary-Ebene importieren!"
-
-msgid "{0} ({1} images)"
-msgstr "{0} ({1} Bilder)"
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-"Von welcher Quelle möchten Sie Bilder auf die Mapillary-Ebene importieren?"
-
-msgid "There are currently no layers with geotagged images!"
-msgstr "There are currently no layers with geotagged images!"
-
-msgid "Images from my file system"
-msgstr "Bilder von meinem Dateisystem"
-
-msgid "Select the images you want to import"
-msgstr "Wählen Sie die Bilder aus, die Sie importieren möchten"
-
-msgid "All images in a directory"
-msgstr "Alle Bilder in einem Verzeichnis"
-
-msgid "Select directory to import images from"
-msgstr "Wählen Sie das Verzeichnis zum Importieren von Bildern aus"
-
-msgid "From existing image layer"
-msgstr "Von vorhandener Bildebene"
-
-msgid "Import exception"
-msgstr "Importausnahme"
-
-msgid "Could not import the image ''{0}''!"
-msgstr "Bild ''{0}'' konnte nicht importiert werden!"
-
-msgid "Could not import the directory ''{0}''!"
-msgstr "Verzeichnis ''{0}'' konnte nicht importiert werden!"
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-"Ein Tag mit dem Schlüssel <i>{0}</i> ist bereits bei dem ausgewählten OSM-"
-"Objekt vorhanden."
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-"Möchten Sie wirklich den jetzigen Wert <i>{0}</i> mit dem neuen Wert "
-"<i>{1}</i> ersetzen?"
-
-msgid "Tag conflict"
-msgstr "Tag-Konflikt"
-
-msgid "Key copied to clipboard"
-msgstr "Schlüssel wurde in die Zwischenablage kopiert"
-
-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 ""
-"Das Mapillary-Plugin verwendet nun ein separates Fenster, um zusätzliche "
-"Informationen (z.B. den Schlüssel des Bildes) sowie Aktionen für das "
-"momentan ausgewählte Bild (z.B. das Bild in einem Browser anzuzeigen) "
-"anzuzeigen."
-
-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 ""
-"Es kann durch klicken auf den Knopf links unten in dieser Nachricht oder auf "
-"den Knopf mit dem selben Symbol in der Werkzeugleiste am linken Rand des "
-"JOSM-Fensters aktiviert werden."
-
-msgid "I got it, close this."
-msgstr "Ich habe verstanden, Nachricht schließen."
-
-msgid "Image info"
-msgstr "Bildinformationen"
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-"Angeige von detaillierten Informationen über das momentan ausgewählte "
-"Mapillary-Bild"
-
-msgid "Show detections on top of image"
-msgstr "Zeige Erkennungen über dem Bild"
-
-msgid "View in browser"
-msgstr "Im Webbrowser ansehen"
-
-msgid "Copy key"
-msgstr "Schlüssel kopieren"
-
-msgid "Add Mapillary tag"
-msgstr "Mapillary-Tag hinzufügen"
-
-msgid "Image detections"
-msgstr "Bilderkennungen"
-
-msgid "Image actions"
-msgstr "Bildaktionen"
-
-msgid "Image key"
-msgstr "Bildschlüssel"
-
-msgid "Sequence key"
-msgstr "Sequenzschlüssel"
-
-msgid "{0} detections"
-msgstr "{0} Erkennungen"
-
-msgid "image has no key"
-msgstr "Bild hat keinen Schlüssel"
-
-msgid "unknown user"
-msgstr "unbekannter Nutzer"
-
-msgid "sequence has no key"
-msgstr "Sequenz hat keinen Schlüssel"
-
-msgid "Could not open the URL {0} in a browser"
-msgstr "Konnte die URL {0} nicht in einem Browser öffnen"
-
-msgid "Downloading map objects…"
-msgstr "Kartenobjekte werden heruntergeladen..."
-
-msgid "All map objects loaded."
-msgstr "Alle Kartenobjekte geladen."
-
-msgid "Too many map objects, zoom in to see all."
-msgstr "Zu viele Kartenobjekte, vergrößern um alle zu sehen."
-
-msgid "Downloading map objects failed!"
-msgstr "Herunterladen von Kartenobjekten fehlgeschlagen!"
-
-msgid "Mapillary objects"
-msgstr "Mapillary-Objekte"
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr "Zeigt von Mapillary erkannte Objekte der Straßenansichtsbilder an"
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] "{0} Bild gelöscht"
-msgstr[1] "{0} Bilder gelöscht"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "{0} Bild importiert"
-msgstr[1] "{0} Bilder importiert"
-
-msgid "2 images joined"
-msgstr "2 Bilder verbunden"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "{0} Bild verschoben"
-msgstr[1] "{0} Bilder verschoben"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "{0} Bild gedreht"
-msgstr[1] "{0} Bilder gedreht"
-
-msgid "2 images unjoined"
-msgstr "2 Bilder getrennt"
-
-msgid "Could not read from URL {0}!"
-msgstr "Konnte nicht von URL {0} lesen!"
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-"{0}\n"
-"Kartenobjekte konnten nicht von URL\n"
-"{1}\n"
-"gelesen werden!"
-
-msgid "everything in the visible area"
-msgstr "alles im sichtbaren Bereich"
-
-msgid "areas with downloaded OSM-data"
-msgstr "Gebiete mit heruntergeladenen OSM-Daten"
-
-msgid "only when manually requested"
-msgstr "nur wenn manuell angefordert"
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-"Die Mapillary-Ebene hat das Herunterladen von Bildern gestoppt, weil der "
-"angeforderte Bereich zu groß ist!"
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-"Um dieses Problem zu lösen, können Sie einen kleineren Ausschnitt der Karte "
-"vergrößern und laden."
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-"Um dieses Problem zu lösen, können Sie in den Herunterlademodus ''{0}'' "
-"wechseln und Mapillary-Bilder für einen kleineren Teil der Karte laden."
-
-msgid "Downloading"
-msgstr "Wird heruntergeladen"
-
-msgid "Select mode"
-msgstr "Auswahlmodus"
-
-msgid "Mapillary login"
-msgstr "Mapillary-Anmeldung"
-
-msgid "Login successful, return to JOSM."
-msgstr "Anmeldung erfolgreich, zurück zu JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Unterstützte Bildformate (JPG und PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "Mapillary-Bilder werden heruntergeladen"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Mapillary-Bilder insgesamt: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr "Mapillary-Änderungssatz wird gesendet"
-
-msgid "No images found"
-msgstr "Keine Bilder gefunden"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr "Sie haben {0} Bilder erfolgreich zu mapillary.com hochgeladen"
-
-msgid "Finished upload"
-msgstr "Hochladen abgeschlossen"
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-"Sie sind nicht angemeldet, bitte melden Sie sich in den Einstellungen bei "
-"Mapillary an"
-
-msgid "Not Logged in to Mapillary"
-msgstr "Nicht bei Mapillary angemeldet"
-
-msgid "Uploading: {0}"
-msgstr "Hachladevorgang: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -31864,6 +31378,115 @@ msgstr "Für dieses Objekt wurde keine Adresse gefunden."
 msgid "An unexpected exception occurred:"
 msgstr "Eine unvorhergesehene Fehlersituation trat auf:"
 
+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 ""
+"Dieses Werkzeug kann nur einen Punkt ersetzen, einen Punkt zu einer Linie "
+"oder einem Multipolygon erweitern, oder eine Linie durch eine Linie ersetzen."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "Punkt gehört zu Linie(n). Konnte nicht ersetzt werden."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+"Die Relation ist kein Multipolygon und kann nicht als Ersetzung genutzt "
+"werden."
+
+msgid "Replace geometry for node {0}"
+msgstr "Geometrie von Punkt {0} ersetzen"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Bitte eine in der Datenbank existierende Linie und eine neue Linie mit "
+"passender Geometrie auswählen."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr ""
+"Die Linien müssen sich vollständig im heruntergeladenen Gebiet befinden."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"Die zu ersetzende Linie darf keine Punkte mit Eigenschaften oder "
+"Relationsmitgliedschaften enthalten, außer sie gehören zu beiden Linien."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"Wiederholungslimit der robusten Methode wurde überschritten, verwende "
+"einfache Methode."
+
+msgid "Replace geometry for way {0}"
+msgstr "Geometrie der Linie {0} ersetzen"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Zu viele Linien wurden hinzugefügt: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr "Gebäudegeneralisierung"
 
@@ -31901,9 +31524,30 @@ msgid "Cannot place building outside of the world."
 msgstr ""
 "Das Gebäude kann nicht außerhalb der Kartenbegrenzung positioniert werden."
 
+msgid "Add nodes for building"
+msgstr "Gebäudepunkte hinzufügen"
+
 msgid "Create building"
 msgstr "Erstelle ein Gebäude"
 
+msgid "Add address for building"
+msgstr "Adresse des Gebäudes hinzufügen"
+
+msgid "Set building shape to circle"
+msgstr "Kreis als Gebäudeform festlegen"
+
+msgid "Set buildings shape to circle"
+msgstr "Kreis als Gebäudeform festlegen"
+
+msgid "Data: {0}"
+msgstr "Daten: {0}"
+
+msgid "Set building shape to rectangle"
+msgstr "Rechteck als Gebäudeform festlegen"
+
+msgid "Set buildings shape to rectangle"
+msgstr "Rechteck als Gebäudeform festlegen"
+
 msgid "Set buildings size"
 msgstr "Größe des Gebäudes festlegen"
 
@@ -31916,8 +31560,17 @@ msgstr "Gebäude automatisch wählen."
 msgid "Use address nodes under buildings"
 msgstr "Adresspunkte unter Gebäuden nutzen"
 
-msgid "Buildings width:"
-msgstr "Breite des Gebäudes:"
+msgid "Circle"
+msgstr "Kreis"
+
+msgid "Rectangle"
+msgstr "Rechteck"
+
+msgid "Set buildings size and shape"
+msgstr "Gebäudegröße und -form festlegen"
+
+msgid "Buildings width/diameter:"
+msgstr "Gebäudebreite/-durchmesser"
 
 msgid "Length step:"
 msgstr "Schrittweite:"
@@ -32683,6 +32336,18 @@ msgstr "Das ausgewählte Farbschema aus der Liste löschen."
 msgid "Color Schemes"
 msgstr "Farbschemata"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Merkmalsbearbeitung abbrechen und Dialog schließen"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Geänderte Merkmale anwenden und Dialog schließen"
+
 msgid "Conflation"
 msgstr "Zusammenführung"
 
@@ -33215,6 +32880,9 @@ msgstr "GeoChat-Bedienfeld öffnen"
 msgid "Zoom in to see messages"
 msgstr "Hineinzoomen, um Nachrichten zu sehen"
 
+msgid "Login"
+msgstr "Anmelden"
+
 msgid "Enable autologin"
 msgstr "Automatische Anmeldung aktivieren"
 
@@ -33247,24 +32915,15 @@ msgstr "Privatunterhaltung"
 msgid "Close tab"
 msgstr "Reiter schließen"
 
+msgid "Logout"
+msgstr "Abmelden"
+
 msgid "Clear log"
 msgstr "Protokoll leeren"
 
 msgid "Show users on map"
 msgstr "Nutzer auf Karte anzeigen"
 
-msgid "GeoJSON file"
-msgstr "GeoJSON-Datei"
-
-msgid "Loading json file..."
-msgstr "JSON-Datei wird geladen..."
-
-msgid "Data Layer from GeoJSON: "
-msgstr "Datenebene aus GeoJSON: "
-
-msgid "Error loading geojson file {0}"
-msgstr "Fehler beim Laden der GeoJSON-Datei {0}"
-
 msgid "Position only"
 msgstr "Nur Position"
 
@@ -33355,6 +33014,9 @@ msgstr "Globalsat-Import"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Daten vom Globalsat-Datenlogger DG100 in eine GPS-Ebene importieren."
 
+msgid "Import"
+msgstr "Importieren"
+
 msgid "GPS Blams"
 msgstr "GPS Blams"
 
@@ -34102,8 +33764,29 @@ msgstr "Strukturtyp:"
 msgid "Offset into background:"
 msgstr "Versatz in den Hintergrund:"
 
-msgid "Indoor Mapping Helper"
-msgstr "Innenkartierungshelfer"
+msgid "ConfirmObjectDrawing"
+msgstr "BestätigeObjektZeichnen"
+
+msgid "ConfirmMultipolygonSelection"
+msgstr "BestätigeMultipolygonAuswahl"
+
+msgid "Please insert a value."
+msgstr "Bitte einen Wert eingeben."
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+"Erst die Leertaste drücken um das \"äußere\" Objekt zur Relation "
+"hinzuzufügen."
+
+msgid "Relation-Error"
+msgstr "Relationsfehler"
+
+msgid "No data selected."
+msgstr "Keine Daten ausgewählt."
+
+msgid "No relation or no relation member with role \"outer\" selected."
+msgstr ""
+"Keine Relation oder kein Relationselement mit Rolle \"outer\" ausgewählt."
 
 msgid "POWER"
 msgstr "EIN/AUS"
@@ -34135,36 +33818,103 @@ msgstr "Legt das Referenzmerkmal fest, wenn das Raum-Objekt ausgewählt ist."
 msgid "Apply Tags"
 msgstr "Merkmale anwenden"
 
-msgid "Fitting"
-msgstr "Anpassung"
+msgid "Add a new level"
+msgstr "Neues Stockwerk hinzufügen"
 
 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>Bitte beachten Sie, dass Sie Ihre Gebäudepläne jetzt anpassen "
-"sollten.<br>Verwenden Sie dazu die PicLayer-Erweiterung, welche Sie über "
-"die<br>JOSM-Erweiterungsverwaltung installieren können.</html>"
-
-msgid "Level Selection"
-msgstr "Stockwerkauswahl"
+"<html>Geben Sie bitte die neue Level Nummer an die sie hinzufügen "
+"wollen.<br> <i>Info</i>: <br>Drücken des OK Knopfs wechselt zur Zeichen-"
+"Aktion.<br>Um das neue Objekt zu beenden bitte die Leertaste drücken. Das "
+"neue Level<br>wird automatisch getaggt.</html>"
 
-msgid "Lowest Level"
-msgstr "Unterstes Stockwerk"
+msgid "level number:"
+msgstr "Stockwerknummer:"
 
-msgid "The lowest level of your building."
-msgstr "Das unterste Stockwerk Ihres Gebäudes."
+msgid "Example: ''2'' or ''3''"
+msgstr "Beispiel: ''2'' oder ''3''"
 
-msgid "Highest Level"
-msgstr "Oberstes Stockwerk"
-
-msgid "The highest level of your building."
-msgstr "Das oberste Stockwerk Ihres Gebäudes."
+msgid "Indoor Mapping Helper"
+msgstr "Innenkartierungshelfer"
 
 msgid "Toolbox for indoor mapping assistance"
 msgstr "Werkzeugkasten für Innenkartierungsunterstützung"
 
+msgid "Insert level"
+msgstr "Stockwerk einfügen"
+
+msgid "Add a new level to layer."
+msgstr "Neues Stockwerk zu Ebene hinzufügen."
+
+msgid "<html><b>?</strong></b>"
+msgstr "<html><b>?</strong></b>"
+
+msgid "Show Help-Browser."
+msgstr "Zeige Hilfe-Browser."
+
+msgid "Level name"
+msgstr "Stockwerksname"
+
+msgid "Sets optional name tag for a level."
+msgstr "Setze optionalen Name für ein Level."
+
+msgid "Working level: NONE"
+msgstr "Arbeitsebene: KEINE"
+
+msgid "Shows the current working level."
+msgstr "Zeigt die aktuelle Arbeitsebene."
+
+msgid "Deactivate automatic level tagging."
+msgstr "Deaktiviere automatisches Level tagging."
+
+msgid "Sets the name tag."
+msgstr "Setzt den Namens-Tag."
+
+msgid "Sets the referance tag."
+msgstr "Setzt den Referenz-Tag."
+
+msgid "Repeat on"
+msgstr "Wiederholen auf"
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+"Wiederhole den Tag wenn highway Objekte ausgewählt werden. Bitte wie folgt "
+"taggen: -3-4 oder -2--3 oder 5-6."
+
+msgid "OUTER"
+msgstr "OUTER"
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+"Erstellungs-Tool für Multipolygone mit Rolle: outer. Leertaste zum Beenden."
+
+msgid "INNER"
+msgstr "INNER"
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+"Erstellungs-Tool für Multipolygone mit Rolle: inner. Leertaste zum Beenden. "
+"Zum Hinzufügen zur Relation \"outer\" auswählen und Enter drücken."
+
+msgid "Deactivate multipolygon function."
+msgstr "Deaktiviere Multipolygon Funktion."
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr "Anfügen der ausgewählten Tags und/oder Relationen zum Objekt."
+
+msgid "Working level: {0}"
+msgstr "Arbeitsebene: {0}"
+
 msgid "InfoMode"
 msgstr "Informationsmodus"
 
@@ -35352,6 +35102,27 @@ msgstr "Dateiendung unbekannt: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Fehler beim Einlesen von Datei \"{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"
 
@@ -35632,6 +35403,8 @@ msgstr "Datei ''{0}'' kann nicht verarbeitet werden:"
 msgid ""
 "Writing position information to image files... Estimated time left: {0}"
 msgstr ""
+"Positionsinformationen werden in Bilddateien gespeichert. Geschätzte "
+"Restzeit: {0}"
 
 msgid "File could not be deleted!"
 msgstr "Datei konnte nicht gelöscht werden!"
@@ -35692,6 +35465,9 @@ msgstr "GPS-Daten des Fotos bearbeiten"
 msgid "Please select an image first."
 msgstr "Bitte wählen Sie zuerst ein Bild aus."
 
+msgid "No image selected"
+msgstr "Kein Bild ausgewählt"
+
 msgid "(Empty values delete the according fields.)"
 msgstr "(Leere Werte löschen die entsprechenden Felder.)"
 
@@ -36467,6 +36243,9 @@ msgstr "implizit"
 msgid "State"
 msgstr "Bundesland"
 
+msgid "pending"
+msgstr "ausstehend"
+
 msgid "[incomplete]"
 msgstr "[unvollständig]"
 
@@ -36897,12 +36676,6 @@ msgstr ""
 "Einstellung ''{0}'' fehlt. Kann die Separate-Data-Store-API nicht "
 "initialisieren."
 
-msgid "Failed to open connection to API {0}."
-msgstr "Verbindung zu API {0} konnte nicht geöffnet werden."
-
-msgid "Proxy Authentication Required"
-msgstr "Proxy-Legitimierung erforderlich"
-
 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>"
@@ -37269,12 +37042,6 @@ msgstr "JOSM-Merkmalsbearbeitungserweiterung"
 msgid "Presets"
 msgstr "Vorlagen"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Merkmalsbearbeitung abbrechen und Dialog schließen"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Geänderte Merkmale anwenden und Dialog schließen"
-
 msgid "Highlight"
 msgstr "Hervorheben"
 
@@ -39029,50 +38796,6 @@ msgstr ""
 "Dieses Werkzeug ersetzt die Geometrie eines Objektes durch eine andere, "
 "deswegen müssen genau zwei Objekte ausgewählt sein."
 
-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 ""
-"Dieses Werkzeug kann nur einen Punkt ersetzen, einen Punkt zu einer Linie "
-"oder einem Multipolygon erweitern, oder eine Linie durch eine Linie ersetzen."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "Punkt gehört zu Linie(n). Konnte nicht ersetzt werden."
-
-msgid "Replace geometry for node {0}"
-msgstr "Geometrie von Punkt {0} ersetzen"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-"Die Relation ist kein Multipolygon und kann nicht als Ersetzung genutzt "
-"werden."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Bitte eine in der Datenbank existierende Linie und eine neue Linie mit "
-"passender Geometrie auswählen."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr ""
-"Die Linien müssen sich vollständig im heruntergeladenen Gebiet befinden."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"Die zu ersetzende Linie darf keine Punkte mit Eigenschaften oder "
-"Relationsmitgliedschaften enthalten, außer sie gehören zu beiden Linien."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"Wiederholungslimit der robusten Methode wurde überschritten, verwende "
-"einfache Methode."
-
-msgid "Replace geometry for way {0}"
-msgstr "Geometrie der Linie {0} ersetzen"
-
 msgid "Replace Membership"
 msgstr "Mitgliedschaft ersetzen"
 
@@ -39153,9 +38876,6 @@ msgstr "Mittelpunkte auswählen"
 msgid "Please select two nodes connected by way!"
 msgstr "Bitte zwei durch eine Linie verbundene Punkte wählen!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Zu viele Linien wurden hinzugefügt: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Alles innerhalb [Testmodus]"
 
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index f281f5d..f12dd16 100644
--- a/i18n/po/de_DE.po
+++ b/i18n/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2011-07-10 12:32+0000\n"
 "Last-Translator: ralekuja <Unknown>\n"
 "Language-Team: German (Germany) <de_DE at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:09+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:09+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -955,8 +955,8 @@ msgstr ""
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
-msgstr "Separate Ebene"
+msgid "Download as new layer"
+msgstr ""
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Auswählen, ob die Daten in eine neue Ebene geladen werden sollen"
@@ -2253,12 +2253,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"
@@ -8255,9 +8255,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>"
@@ -9710,6 +9707,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12752,9 +12752,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 ""
 
@@ -14447,6 +14444,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 ""
 
@@ -14456,10 +14457,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 ""
@@ -16286,10 +16283,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17775,6 +17768,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17796,6 +17792,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20449,6 +20448,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23520,6 +23525,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 ""
 
@@ -23601,7 +23633,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23616,7 +23648,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 ""
@@ -23624,21 +23656,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 ""
 
@@ -23777,13 +23831,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"
@@ -23816,14 +23870,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 ""
@@ -23889,7 +23943,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)"
@@ -23976,13 +24030,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)"
@@ -24150,34 +24204,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 ""
@@ -24185,7 +24238,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)"
@@ -24233,7 +24286,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24241,7 +24294,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 ""
@@ -24410,8 +24463,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 ""
@@ -24419,9 +24471,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 ""
@@ -24429,10 +24479,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"
@@ -24465,57 +24515,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 ""
@@ -24523,13 +24568,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 ""
@@ -24597,13 +24642,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 ""
@@ -24611,7 +24656,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24619,7 +24664,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24627,19 +24672,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 ""
@@ -24744,13 +24789,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 ""
@@ -24758,7 +24803,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)"
@@ -24852,13 +24897,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 ""
 
@@ -24946,6 +24984,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 ""
 
@@ -24954,6 +25006,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 ""
 
@@ -24961,13 +25037,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 ""
@@ -24981,7 +25057,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 ""
@@ -24989,29 +25065,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)"
@@ -25080,7 +25155,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"
@@ -25113,6 +25191,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 ""
 
@@ -25161,33 +25245,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 ""
@@ -25195,7 +25277,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)"
@@ -25241,25 +25323,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"
@@ -25283,7 +25365,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)"
@@ -25379,7 +25461,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 ""
@@ -25387,6 +25469,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 ""
 
@@ -25405,7 +25494,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)"
@@ -25467,7 +25556,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 ""
@@ -25475,13 +25564,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)"
@@ -25568,7 +25657,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 ""
@@ -25576,7 +25672,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"
@@ -25591,6 +25687,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26582,32 +26684,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"
@@ -26616,9 +26714,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 ""
 
@@ -26725,6 +26820,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 ""
 
@@ -26768,6 +26866,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."
@@ -26801,6 +26902,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26848,6 +26952,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 ""
 
@@ -27013,6 +27122,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 ""
@@ -27802,550 +27914,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 ""
 
@@ -29040,6 +28608,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 ""
 
@@ -29073,9 +28739,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 ""
 
@@ -29088,7 +28775,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:"
@@ -29771,6 +29467,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 ""
 
@@ -30265,6 +29973,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30297,22 +30008,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"
@@ -30402,6 +30104,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31091,7 +30796,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"
@@ -31124,31 +30847,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"
@@ -32229,6 +32013,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 ""
 
@@ -32562,6 +32367,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33299,6 +33107,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33709,12 +33520,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>"
@@ -34051,12 +33856,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35597,39 +35396,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 ""
 
@@ -35703,9 +35469,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/el.po b/i18n/po/el.po
index afc76af..e2bd1f3 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.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: 2016-01-25 09:17+0000\n"
-"Last-Translator: Aggelos Arnaoutis <angelosarn at hotmail.com>\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-16 20:28+0000\n"
+"Last-Translator: Dimitris Beretzikis <beretzikis at gmail.com>\n"
 "Language-Team: Greek <el 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:45+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:45+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: el\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -57,7 +57,7 @@ msgstr ""
 "Το άνοιγμα δεσμού δεν υποστηρίζεται στην τρέχουσα πλατφόρμα (''{0}'')"
 
 msgid "Failed to save default preferences."
-msgstr ""
+msgstr "Αποτυχία αποθήκευσης προεπιλεγμένων προτιμήσεων."
 
 msgid "About"
 msgstr "Περί"
@@ -108,10 +108,10 @@ msgid "Report bug"
 msgstr "Αναφορά σφάλματος"
 
 msgid "Failed to locate resource ''{0}''."
-msgstr ""
+msgstr "Αποτυχία εντοπισμού του πόρου ''{0}''."
 
 msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
+msgstr "Δεν ήταν δυνατή η φόρτωση του πόρου ''{0}'', το σφάλμα είναι {1}."
 
 msgid ""
 "You are about to launch {0} browser window.<br>This may both clutter your "
@@ -1035,8 +1035,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 "Επιλέξτε αν τα δεδομένα πρέπει να ληφθούν σε νέο επίπεδο"
@@ -2403,12 +2403,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"
@@ -8507,9 +8507,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>"
@@ -10019,6 +10016,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -13095,9 +13095,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 "Επιβεβαίωση των ενεργειών του Τηλεχειρισμού χειροκίνητα"
 
@@ -14814,6 +14811,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 ""
 
@@ -14823,10 +14824,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 ""
@@ -16667,10 +16664,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -18156,6 +18149,9 @@ msgstr "Bio Diesel"
 msgid "Octane 80"
 msgstr "80 Οκτάνια"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "91 Οκτάνια"
 
@@ -18177,6 +18173,9 @@ msgstr "E10 (10% μείγμα αιθανόλης)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% μείγμα αιθανόλης)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20830,6 +20829,12 @@ msgstr "Συντριβάνι"
 msgid "Water Well"
 msgstr "Πηγάδι"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Φάρος"
 
@@ -23901,6 +23906,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"
 
@@ -23982,7 +24014,7 @@ msgstr "Επιθεωρητής OSM: Διευθύνσεις"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23997,7 +24029,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 ""
@@ -24005,21 +24037,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 ""
 
@@ -24158,13 +24212,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"
@@ -24197,14 +24251,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 ""
@@ -24270,7 +24324,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)"
@@ -24357,13 +24411,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)"
@@ -24531,34 +24585,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 ""
@@ -24566,7 +24619,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)"
@@ -24614,7 +24667,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24622,7 +24675,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 ""
@@ -24791,8 +24844,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 ""
@@ -24800,9 +24852,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 ""
@@ -24810,10 +24860,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"
@@ -24846,57 +24896,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 ""
@@ -24904,13 +24949,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 ""
@@ -24978,13 +25023,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 ""
@@ -24992,7 +25037,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -25000,7 +25045,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -25008,19 +25053,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 ""
@@ -25125,13 +25170,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 ""
@@ -25139,7 +25184,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)"
@@ -25233,13 +25278,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 ""
 
@@ -25327,6 +25365,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 ""
 
@@ -25335,6 +25387,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 ""
 
@@ -25342,13 +25418,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 ""
@@ -25362,7 +25438,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 ""
@@ -25370,29 +25446,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)"
@@ -25461,7 +25536,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"
@@ -25494,6 +25572,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 ""
 
@@ -25542,33 +25626,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 ""
@@ -25576,7 +25658,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)"
@@ -25622,25 +25704,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"
@@ -25664,7 +25746,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)"
@@ -25760,7 +25842,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 ""
@@ -25768,6 +25850,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 ""
 
@@ -25786,7 +25875,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)"
@@ -25848,7 +25937,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 ""
@@ -25856,13 +25945,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)"
@@ -25949,7 +26038,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 ""
@@ -25957,7 +26053,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"
@@ -25972,6 +26068,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26963,32 +27065,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"
@@ -26997,9 +27095,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 ""
 
@@ -27106,6 +27201,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 ""
 
@@ -27149,6 +27247,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."
@@ -27182,6 +27283,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -27229,6 +27333,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 ""
 
@@ -27394,6 +27503,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 ""
@@ -28185,550 +28297,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 ""
 
@@ -29425,6 +28993,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 "Αντικατάσταση γεωμετρίας της διαδρομής {0}"
+
+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 ""
 
@@ -29458,9 +29124,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 "Ορισμός μεγέθους κτηρίων"
 
@@ -29473,8 +29160,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 ""
@@ -30157,6 +29853,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 ""
 
@@ -30652,6 +30360,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30684,22 +30395,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"
@@ -30789,6 +30491,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 ""
 
@@ -31480,7 +31185,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"
@@ -31513,31 +31236,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"
@@ -32632,6 +32416,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"
 
@@ -32967,6 +32772,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33706,6 +33514,9 @@ msgstr ""
 msgid "State"
 msgstr "Πολιτεία"
 
+msgid "pending"
+msgstr "εκκρεμεί"
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -34117,12 +33928,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>"
@@ -34459,12 +34264,6 @@ msgstr ""
 msgid "Presets"
 msgstr "Προεπιλογές"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr "Τονισμός"
 
@@ -36047,39 +35846,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 "Αντικατάσταση γεωμετρίας της διαδρομής {0}"
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -36157,9 +35923,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/en_AU.po b/i18n/po/en_AU.po
index d6f0b3f..704bd59 100644
--- a/i18n/po/en_AU.po
+++ b/i18n/po/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2015-06-08 12:52+0000\n"
 "Last-Translator: Mark Pulley <mrpulley at iinet.net.au>\n"
 "Language-Team: English (Australia) <en_AU at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:07+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:08+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1015,8 +1015,8 @@ msgstr "Enter URL to download:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Enter an URL from where data should be downloaded"
 
-msgid "Separate Layer"
-msgstr "Separate Layer"
+msgid "Download as new layer"
+msgstr "Download as new layer"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Select if the data should be downloaded into a new layer"
@@ -2413,12 +2413,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"
@@ -8726,9 +8726,6 @@ msgstr "Value for latitude in range [-90,90] required."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Value for longitude in range [-180,180] required."
 
-msgid "Download as new layer"
-msgstr "Download as new layer"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10330,6 +10327,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -13544,9 +13544,6 @@ msgstr "Remote Control"
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr ""
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -15332,6 +15329,10 @@ msgstr "Keep plug-in"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Click to keep the plug-in ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr ""
 
@@ -15341,10 +15342,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 ""
@@ -17215,10 +17212,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -18704,6 +18697,9 @@ msgstr "Bio Diesel"
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "Octane 91"
 
@@ -18725,6 +18721,9 @@ msgstr "E10 (10% Ethanol mix)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol mix)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Liquefied petroleum gas)"
 
@@ -21378,6 +21377,12 @@ msgstr "Fountain"
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Lighthouse"
 
@@ -24449,6 +24454,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 ""
 
@@ -24530,7 +24562,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -24545,7 +24577,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 ""
@@ -24553,21 +24585,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 ""
 
@@ -24706,13 +24760,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"
@@ -24745,14 +24799,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 ""
@@ -24818,7 +24872,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)"
@@ -24905,13 +24959,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)"
@@ -25079,34 +25133,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 ""
@@ -25114,7 +25167,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)"
@@ -25162,7 +25215,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -25170,7 +25223,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 ""
@@ -25339,8 +25392,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 ""
@@ -25348,9 +25400,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 ""
@@ -25358,10 +25408,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"
@@ -25394,57 +25444,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 ""
@@ -25452,13 +25497,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 ""
@@ -25526,13 +25571,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 ""
@@ -25540,7 +25585,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -25548,7 +25593,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -25556,19 +25601,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 ""
@@ -25673,13 +25718,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 ""
@@ -25687,7 +25732,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)"
@@ -25781,13 +25826,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 ""
 
@@ -25875,6 +25913,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 ""
 
@@ -25883,6 +25935,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 ""
 
@@ -25890,13 +25966,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 ""
@@ -25910,7 +25986,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 ""
@@ -25918,29 +25994,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)"
@@ -26009,7 +26084,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"
@@ -26042,6 +26120,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 ""
 
@@ -26090,33 +26174,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 ""
@@ -26124,7 +26206,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)"
@@ -26170,25 +26252,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"
@@ -26212,7 +26294,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)"
@@ -26308,7 +26390,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 ""
@@ -26316,6 +26398,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 ""
 
@@ -26334,7 +26423,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)"
@@ -26396,7 +26485,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 ""
@@ -26404,13 +26493,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)"
@@ -26497,7 +26586,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 ""
@@ -26505,7 +26601,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"
@@ -26520,6 +26616,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -27511,32 +27613,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"
@@ -27545,9 +27643,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 ""
 
@@ -27654,6 +27749,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 ""
 
@@ -27699,6 +27797,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."
@@ -27732,6 +27833,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -27783,6 +27887,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 ""
 
@@ -27957,6 +28066,9 @@ msgid ""
 msgstr ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -28762,550 +28874,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 "Import"
-
-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 ""
 
@@ -30001,6 +29569,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 ""
 
@@ -30034,9 +29700,30 @@ msgstr ""
 msgid "Cannot place building outside of the world."
 msgstr "Cannot place building outside of the world."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Create building"
 
+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 "Set buildings size"
 
@@ -30049,8 +29736,17 @@ msgstr ""
 msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Buildings width:"
-msgstr "Buildings width:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Length step:"
@@ -30772,6 +30468,18 @@ msgstr "Delete the selected scheme from the list."
 msgid "Color Schemes"
 msgstr "Colour Schemes"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Abort tag editing and close dialogue"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Apply edited tags and close dialogue"
+
 msgid "Conflation"
 msgstr ""
 
@@ -31266,6 +30974,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -31298,22 +31009,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"
@@ -31406,6 +31108,9 @@ msgstr "Globalsat Import"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Import Data from Globalsat Datalogger DG100 into GPX layer."
 
+msgid "Import"
+msgstr "Import"
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -32095,7 +31800,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"
@@ -32128,31 +31851,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"
@@ -33242,6 +33026,27 @@ msgstr "Unknown file extension: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Parsing file \"{0}\" failed"
 
+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"
 
@@ -33578,6 +33383,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -34315,6 +34123,9 @@ msgstr ""
 msgid "State"
 msgstr "State"
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -34729,12 +34540,6 @@ msgstr "New value for {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr "Failed to open connection to 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>"
@@ -35071,12 +34876,6 @@ msgstr "JOSM Tag Editor Plug-in"
 msgid "Presets"
 msgstr "Presets"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Abort tag editing and close dialogue"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Apply edited tags and close dialogue"
-
 msgid "Highlight"
 msgstr "Highlight"
 
@@ -36618,39 +36417,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 ""
 
@@ -36724,9 +36490,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/en_CA.po b/i18n/po/en_CA.po
index 8a52ee1..5993247 100644
--- a/i18n/po/en_CA.po
+++ b/i18n/po/en_CA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2010-09-24 17:25+0000\n"
 "Last-Translator: Johann Beda <Unknown>\n"
 "Language-Team: English (Canada) <en_CA at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:09+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:10+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -953,8 +953,8 @@ msgstr ""
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
-msgstr "Separate Layer"
+msgid "Download as new layer"
+msgstr ""
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Select if the data should be downloaded into a new layer"
@@ -2251,12 +2251,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"
@@ -8252,9 +8252,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>"
@@ -9707,6 +9704,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12749,9 +12749,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 ""
 
@@ -14444,6 +14441,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 ""
 
@@ -14453,10 +14454,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 ""
@@ -16280,10 +16277,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17769,6 +17762,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17790,6 +17786,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20443,6 +20442,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23514,6 +23519,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 ""
 
@@ -23595,7 +23627,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23610,7 +23642,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 ""
@@ -23618,21 +23650,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 ""
 
@@ -23771,13 +23825,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"
@@ -23810,14 +23864,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 ""
@@ -23883,7 +23937,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)"
@@ -23970,13 +24024,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)"
@@ -24144,34 +24198,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 ""
@@ -24179,7 +24232,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)"
@@ -24227,7 +24280,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24235,7 +24288,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 ""
@@ -24404,8 +24457,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 ""
@@ -24413,9 +24465,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 ""
@@ -24423,10 +24473,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"
@@ -24459,57 +24509,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 ""
@@ -24517,13 +24562,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 ""
@@ -24591,13 +24636,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 ""
@@ -24605,7 +24650,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24613,7 +24658,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24621,19 +24666,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 ""
@@ -24738,13 +24783,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 ""
@@ -24752,7 +24797,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)"
@@ -24846,13 +24891,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 ""
 
@@ -24940,6 +24978,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 ""
 
@@ -24948,6 +25000,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 ""
 
@@ -24955,13 +25031,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 ""
@@ -24975,7 +25051,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 ""
@@ -24983,29 +25059,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)"
@@ -25074,7 +25149,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"
@@ -25107,6 +25185,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 ""
 
@@ -25155,33 +25239,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 ""
@@ -25189,7 +25271,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)"
@@ -25235,25 +25317,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"
@@ -25277,7 +25359,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)"
@@ -25373,7 +25455,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 ""
@@ -25381,6 +25463,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 ""
 
@@ -25399,7 +25488,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)"
@@ -25461,7 +25550,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 ""
@@ -25469,13 +25558,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)"
@@ -25562,7 +25651,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 ""
@@ -25570,7 +25666,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"
@@ -25585,6 +25681,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26576,32 +26678,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"
@@ -26610,9 +26708,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 ""
 
@@ -26719,6 +26814,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 ""
 
@@ -26762,6 +26860,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."
@@ -26795,6 +26896,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26842,6 +26946,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 ""
 
@@ -27007,6 +27116,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 ""
@@ -27796,550 +27908,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 ""
 
@@ -29034,6 +28602,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 ""
 
@@ -29067,9 +28733,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 ""
 
@@ -29082,7 +28769,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:"
@@ -29761,6 +29457,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 ""
 
@@ -30255,6 +29963,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30287,22 +29998,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"
@@ -30392,6 +30094,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31081,7 +30786,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"
@@ -31114,31 +30837,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"
@@ -32219,6 +32003,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 ""
 
@@ -32552,6 +32357,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33289,6 +33097,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33699,12 +33510,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>"
@@ -34041,12 +33846,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35587,39 +35386,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 ""
 
@@ -35693,9 +35459,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/en_GB.po b/i18n/po/en_GB.po
index bdc6e58..bb6697a 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -10,16 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-29 14:58+0000\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-28 20:30+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: German <josm-dev at openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:07+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:08+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: de\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1018,8 +1018,8 @@ msgstr "Enter URL to download:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Enter an URL from where data should be downloaded"
 
-msgid "Separate Layer"
-msgstr "Separate Layer"
+msgid "Download as new layer"
+msgstr "Download as new layer"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Select if the data should be downloaded into a new layer"
@@ -2420,17 +2420,17 @@ msgstr "Convert to GPX layer starting from last member"
 
 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 ""
 "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."
 
 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 ""
 "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."
 
 msgid "Selected Relations"
 msgstr "Selected Relations"
@@ -8805,9 +8805,6 @@ msgstr "Value for latitude in range [-90,90] required."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Value for longitude in range [-180,180] required."
 
-msgid "Download as new layer"
-msgstr "Download as new layer"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10436,6 +10433,9 @@ msgstr "No data found in file ''{0}''."
 msgid "Open OSM file"
 msgstr "Open OSM file"
 
+msgid "OSM Server Files XZ compressed"
+msgstr "OSM Server Files XZ compressed"
+
 msgid "Validation Error Files"
 msgstr "Validation Error Files"
 
@@ -13738,9 +13738,6 @@ msgstr "Remote Control"
 msgid "Settings for the remote control feature."
 msgstr "Settings for the remote control feature."
 
-msgid "Download objects to new layer"
-msgstr "Download objects to new layer"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Confirm all Remote Control actions manually"
 
@@ -15609,6 +15606,11 @@ msgstr "Keep plug-in"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Click to keep the plug-in ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Failed to delete outdated plugin ''{0}''."
 
@@ -15620,11 +15622,6 @@ msgstr ""
 "JOSM is still going to load the old plugin version."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -17613,10 +17610,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "rooftop"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "kiosk"
-
 msgid "Start date"
 msgstr "Start date"
 
@@ -19124,6 +19117,9 @@ msgstr "Bio Diesel"
 msgid "Octane 80"
 msgstr "Octane 80"
 
+msgid "Octane 87"
+msgstr "Octane 87"
+
 msgid "Octane 91"
 msgstr "Octane 91"
 
@@ -19145,6 +19141,9 @@ msgstr "E10 (10% Ethanol mix)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol mix)"
 
+msgid "Ethanol (alcohol)"
+msgstr "Ethanol (alcohol)"
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Liquefied petroleum gas)"
 
@@ -21801,6 +21800,12 @@ msgstr "Fountain"
 msgid "Water Well"
 msgstr "Water Well"
 
+msgid "Pump"
+msgstr "Pump"
+
+msgid "powered"
+msgstr "powered"
+
 msgid "Lighthouse"
 msgstr "Lighthouse"
 
@@ -22846,15 +22851,15 @@ msgstr "crypt"
 
 msgctxt "tomb"
 msgid "pyramid"
-msgstr ""
+msgstr "pyramid"
 
 msgctxt "tomb"
 msgid "sarcophagus"
-msgstr ""
+msgstr "sarcophagus"
 
 msgctxt "tomb"
 msgid "vault"
-msgstr ""
+msgstr "vault"
 
 msgid "Monument"
 msgstr "Monument"
@@ -22930,19 +22935,19 @@ msgid "Seafood"
 msgstr "Seafood"
 
 msgid "Dairy"
-msgstr ""
+msgstr "Dairy"
 
 msgid "Cheese"
-msgstr ""
+msgstr "Cheese"
 
 msgid "Deli (Fine Food)"
 msgstr "Deli (Fine Food)"
 
 msgid "Pastry"
-msgstr ""
+msgstr "Pastry"
 
 msgid "Confectionery"
-msgstr ""
+msgstr "Confectionery"
 
 msgid "Tea"
 msgstr "Tea"
@@ -23170,7 +23175,7 @@ msgid "Variety Store"
 msgstr "Variety Store"
 
 msgid "Charity"
-msgstr ""
+msgstr "Charity"
 
 msgid "Bookmaker"
 msgstr "Bookmaker"
@@ -23197,10 +23202,10 @@ msgid "Vending products"
 msgstr "Vending products"
 
 msgid "admission_tickets"
-msgstr ""
+msgstr "admission_tickets"
 
 msgid "animal_feed"
-msgstr ""
+msgstr "animal_feed"
 
 msgid "bicycle_tube"
 msgstr "bicycle_tube"
@@ -23209,7 +23214,7 @@ msgid "cigarettes"
 msgstr "cigarettes"
 
 msgid "coffee"
-msgstr ""
+msgstr "coffee"
 
 msgid "condoms"
 msgstr "condoms"
@@ -23218,7 +23223,7 @@ msgid "drinks"
 msgstr "drinks"
 
 msgid "elongated_coin"
-msgstr ""
+msgstr "elongated_coin"
 
 msgid "excrement_bags"
 msgstr "excrement_bags"
@@ -23236,10 +23241,10 @@ msgid "parking_tickets"
 msgstr "parking_tickets"
 
 msgid "parcel_pickup"
-msgstr ""
+msgstr "parcel_pickup"
 
 msgid "parcel_mail_in"
-msgstr ""
+msgstr "parcel_mail_in"
 
 msgid "photos"
 msgstr "photos"
@@ -23634,7 +23639,7 @@ msgid "Suburb"
 msgstr "Suburb"
 
 msgid "Quarter"
-msgstr ""
+msgstr "Quarter"
 
 msgid "Neighbourhood"
 msgstr "Neighbourhood"
@@ -23833,13 +23838,13 @@ msgid "Scree"
 msgstr "Scree"
 
 msgid "An accumulation of loose angular rocks."
-msgstr ""
+msgstr "An accumulation of loose angular rocks."
 
 msgid "Shingle"
-msgstr ""
+msgstr "Shingle"
 
 msgid "An accumulation of loose rounded rocks on a beach or riverbed."
-msgstr ""
+msgstr "An accumulation of loose rounded rocks on a beach or riverbed."
 
 msgid "Fell"
 msgstr "Fell"
@@ -24003,7 +24008,7 @@ msgid "Plant Nursery"
 msgstr "Plant Nursery"
 
 msgid "Salt Pond"
-msgstr ""
+msgstr "Salt Pond"
 
 msgid "Aquaculture"
 msgstr "Aquaculture"
@@ -24058,75 +24063,75 @@ msgstr "Industrial"
 
 msgctxt "industrial"
 msgid "bakery"
-msgstr ""
+msgstr "bakery"
 
 msgctxt "industrial"
 msgid "brewery"
-msgstr ""
+msgstr "brewery"
 
 msgctxt "industrial"
 msgid "brickyard"
-msgstr ""
+msgstr "brickyard"
 
 msgctxt "industrial"
 msgid "depot"
-msgstr ""
+msgstr "depot"
 
 msgctxt "industrial"
 msgid "distributor"
-msgstr ""
+msgstr "distributor"
 
 msgctxt "industrial"
 msgid "factory"
-msgstr ""
+msgstr "factory"
 
 msgctxt "industrial"
 msgid "grinding_mill"
-msgstr ""
+msgstr "grinding_mill"
 
 msgctxt "industrial"
 msgid "heating_station"
-msgstr ""
+msgstr "heating_station"
 
 msgctxt "industrial"
 msgid "machine_shop"
-msgstr ""
+msgstr "machine_shop"
 
 msgctxt "industrial"
 msgid "mine"
-msgstr ""
+msgstr "mine"
 
 msgctxt "industrial"
 msgid "oil"
-msgstr ""
+msgstr "oil"
 
 msgctxt "industrial"
 msgid "port"
-msgstr ""
+msgstr "port"
 
 msgctxt "industrial"
 msgid "salt_pond"
-msgstr ""
+msgstr "salt_pond"
 
 msgctxt "industrial"
 msgid "sawmill"
-msgstr ""
+msgstr "sawmill"
 
 msgctxt "industrial"
 msgid "scrap_yard"
-msgstr ""
+msgstr "scrap_yard"
 
 msgctxt "industrial"
 msgid "shipyard"
-msgstr ""
+msgstr "shipyard"
 
 msgctxt "industrial"
 msgid "slaughterhouse"
-msgstr ""
+msgstr "slaughterhouse"
 
 msgctxt "industrial"
 msgid "warehouse"
-msgstr ""
+msgstr "warehouse"
 
 msgid "Garages"
 msgstr "Garages"
@@ -24201,7 +24206,7 @@ msgid "Country code"
 msgstr "Country code"
 
 msgid "Unit/Suite"
-msgstr ""
+msgstr "Unit/Suite"
 
 msgid "House name"
 msgstr "House name"
@@ -24498,19 +24503,19 @@ msgid "Label point"
 msgstr "Label point"
 
 msgid "Outline of building"
-msgstr ""
+msgstr "Outline of building"
 
 msgid "Inner segment"
-msgstr ""
+msgstr "Inner segment"
 
 msgid "Roof ridge"
-msgstr ""
+msgstr "Roof ridge"
 
 msgid "Roof edge"
-msgstr ""
+msgstr "Roof edge"
 
 msgid "Building level"
-msgstr ""
+msgstr "Building level"
 
 msgid "Site"
 msgstr "Site"
@@ -24616,19 +24621,19 @@ msgstr "Bicycle Route"
 
 msgctxt "network"
 msgid "international"
-msgstr ""
+msgstr "international"
 
 msgctxt "network"
 msgid "national"
-msgstr ""
+msgstr "national"
 
 msgctxt "network"
 msgid "regional"
-msgstr ""
+msgstr "regional"
 
 msgctxt "network"
 msgid "local"
-msgstr ""
+msgstr "local"
 
 msgid "Mountain Biking Route"
 msgstr "Mountain Biking Route"
@@ -24820,51 +24825,59 @@ msgid "Mapbox Satellite"
 msgstr "Mapbox Satellite"
 
 msgid "DigitalGlobe Premium Imagery"
-msgstr ""
+msgstr "DigitalGlobe Premium Imagery"
 
 msgid ""
 "DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
 "select regions filled with +Vivid or custom area of interest imagery, 50cm "
 "resolution or better, and refreshed more frequently with ongoing updates."
 msgstr ""
+"DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with "
+"select regions filled with +Vivid or custom area of interest imagery, 50cm "
+"resolution or better, and refreshed more frequently with ongoing updates."
 
 msgid "DigitalGlobe Premium Imagery Vintage"
-msgstr ""
+msgstr "DigitalGlobe Premium Imagery Vintage"
 
 msgid ""
 "Imagery boundaries and capture dates. Labels appear at zoom level 14 and "
 "higher."
 msgstr ""
+"Imagery boundaries and capture dates. Labels appear at zoom level 14 and "
+"higher."
 
 msgid "DigitalGlobe Standard Imagery"
-msgstr ""
+msgstr "DigitalGlobe Standard Imagery"
 
 msgid ""
 "DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
 "earth’s landmass, with 30-60cm or resolution where available, backfilled by "
 "Landsat. Average age is 2.31 years, with some areas updated 2x per year."
 msgstr ""
+"DigitalGlobe-Standard is a curated set of imagery covering 86% of the "
+"earth’s landmass, with 30-60cm or resolution where available, backfilled by "
+"Landsat. Average age is 2.31 years, with some areas updated 2x per year."
 
 msgid "DigitalGlobe Standard Imagery Vintage"
-msgstr ""
+msgstr "DigitalGlobe Standard Imagery Vintage"
 
 msgid "Esri World Imagery"
-msgstr ""
+msgstr "Esri World Imagery"
 
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
 
 msgid "Thunderforest Landscape"
-msgstr ""
+msgstr "Thunderforest Landscape"
 
 msgid "OpenSeaMap"
 msgstr "OpenSeaMap"
 
 msgid "OpenStreetMap Carto (Standard)"
-msgstr ""
+msgstr "OpenStreetMap Carto (Standard)"
 
 msgid "OpenStreetMap (Standard Black & White)"
-msgstr ""
+msgstr "OpenStreetMap (Standard Black & White)"
 
 msgid "OpenStreetMap (Mapnik, no labels)"
 msgstr "OpenStreetMap (Mapnik, no labels)"
@@ -24879,10 +24892,10 @@ msgid "OpenStreetMap GPS Traces"
 msgstr "OpenStreetMap GPS Traces"
 
 msgid "Public GPS traces uploaded to OpenStreetMap."
-msgstr ""
+msgstr "Public GPS traces uploaded to OpenStreetMap."
 
 msgid "OpenTopoMap"
-msgstr ""
+msgstr "OpenTopoMap"
 
 msgid "Public Transport (ÖPNV)"
 msgstr "Public Transport (ÖPNV)"
@@ -24891,19 +24904,49 @@ msgid "Hike & Bike"
 msgstr "Hike & Bike"
 
 msgid "OpenSnowMap overlay"
-msgstr ""
+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 "Overlay imagery for railway mapping in 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"
 
 msgid "Stamen Terrain"
-msgstr ""
+msgstr "Stamen Terrain"
 
 msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
-msgstr ""
+msgstr "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
 
 msgid "OpenPT Map (overlay)"
 msgstr "OpenPT Map (overlay)"
@@ -24918,16 +24961,16 @@ msgid "Strava cycling and running heatmap"
 msgstr "Strava cycling and running heatmap"
 
 msgid "Strava water sports heatmap"
-msgstr ""
+msgstr "Strava water sports heatmap"
 
 msgid "Strava winter sports heatmap"
-msgstr ""
+msgstr "Strava winter sports heatmap"
 
 msgid "Locator Overlay"
 msgstr "Locator Overlay"
 
 msgid "Shows major features to help orient you."
-msgstr ""
+msgstr "Shows major features to help orient you."
 
 msgid "QA No Address"
 msgstr "QA No Address"
@@ -24951,7 +24994,7 @@ msgid "Waymarked Trails: Winter Sports"
 msgstr "Waymarked Trails: Winter Sports"
 
 msgid "Wikimedia Map"
-msgstr ""
+msgstr "Wikimedia Map"
 
 msgid "OSM Inspector: Geometry"
 msgstr "OSM Inspector: Geometry"
@@ -24966,7 +25009,7 @@ msgid "OSM Inspector: Highways"
 msgstr "OSM Inspector: Highways"
 
 msgid "OSM Inspector: Area"
-msgstr ""
+msgstr "OSM Inspector: Area"
 
 msgid "OSM Inspector: Routing"
 msgstr "OSM Inspector: Routing"
@@ -24975,192 +25018,220 @@ msgid "OSM Inspector: Addresses"
 msgstr "OSM Inspector: Addresses"
 
 msgid "OSM Inspector: Coastline (EU)"
-msgstr ""
+msgstr "OSM Inspector: Coastline (EU)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr ""
+msgid "imagico.de: Prokletije Mountains"
+msgstr "imagico.de: Prokletije Mountains"
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
 "snow (true color)"
 msgstr ""
+"Late summer imagery where usual sources are severely limited by clouds and "
+"snow (true colour)"
 
 msgid "Municipality of Tirana (Open Labs GeoPortal)"
-msgstr ""
+msgstr "Municipality of Tirana (Open Labs GeoPortal)"
 
 msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
+"Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
-msgstr ""
+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 "
 "(true color)"
 msgstr ""
+"Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
+"(true colour)"
+
+msgid "imagico.de: Pensacola Mountains"
+msgstr "imagico.de: Pensacola Mountains"
+
+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 ""
+"Fairly clear up-to-date image for updating glacier edges (true colour)"
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Bunger Hills"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
 msgstr ""
 
-msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgid "imagico.de: McMurdo Sound and Dry Valleys "
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+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 "Sentinel-2 images of Enderby Land and Kemp Coast (true colour)"
+
+msgid "imagico.de: Larsen C ice shelf after calving"
 msgstr ""
 
-msgid "IGN topographical map (TMS)"
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
 msgstr ""
 
+msgid "IGN topographical map (TMS)"
+msgstr "IGN topographical map (TMS)"
+
 msgid "IGN topographical map (WMTS)"
-msgstr ""
+msgstr "IGN topographical map (WMTS)"
 
 msgid "IGN topographical map (WMS)"
-msgstr ""
+msgstr "IGN topographical map (WMS)"
 
 msgid "IGN orthophoto AMBA a (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto AMBA a (WMTS)"
 
 msgid "IGN orthophoto AMBA b (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto AMBA b (WMTS)"
 
 msgid "IGN orthophoto AMBA c (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto AMBA c (WMTS)"
 
 msgid "IGN orthophoto AMBA d (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto AMBA d (WMTS)"
 
 msgid "IGN orthophoto AMBA e (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto AMBA e (WMTS)"
 
 msgid "IGN orthophoto AMBA f (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto AMBA f (WMTS)"
 
 msgid "IGN orthophoto AMBA 4 (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto AMBA 4 (WMTS)"
 
 msgid "IGN orthophoto AMBA 5 (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto AMBA 5 (WMTS)"
 
 msgid "IGN orthophoto AMBA 6 (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto AMBA 6 (WMTS)"
 
 msgid "IGN orthophoto AMBA 7 (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto AMBA 7 (WMTS)"
 
 msgid "IGN orthophoto Barranqueras (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Barranqueras (WMTS)"
 
 msgid "IGN orthophoto Catamarca (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Catamarca (WMTS)"
 
 msgid "IGN orthophoto Córdoba (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Córdoba (WMTS)"
 
 msgid "IGN orthophoto El Calafate (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto El Calafate (WMTS)"
 
 msgid "IGN orthophoto El Rodeo (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto El Rodeo (WMTS)"
 
 msgid "IGN orthophoto Jujuy (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Jujuy (WMTS)"
 
 msgid "IGN orthophoto La Rioja (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto La Rioja (WMTS)"
 
 msgid "IGN orthophoto Mendoza (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Mendoza (WMTS)"
 
 msgid "IGN orthophoto Neuquén (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Neuquén (WMTS)"
 
 msgid "IGN orthophoto Posadas (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Posadas (WMTS)"
 
 msgid "IGN orthophoto Resistencia (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Resistencia (WMTS)"
 
 msgid "IGN orthophoto Río Gallegos (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Río Gallegos (WMTS)"
 
 msgid "IGN orthophoto Río Grande (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Río Grande (WMTS)"
 
 msgid "IGN orthophoto Río Paraná A (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Río Paraná A (WMTS)"
 
 msgid "IGN orthophoto Río Paraná B (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Río Paraná B (WMTS)"
 
 msgid "IGN orthophoto Rosario (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Rosario (WMTS)"
 
 msgid "IGN orthophoto Salta (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Salta (WMTS)"
 
 msgid "IGN orthophoto Salta 1 (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Salta 1 (WMTS)"
 
 msgid "IGN orthophoto Salta 2 (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Salta 2 (WMTS)"
 
 msgid "IGN orthophoto Salta 3 (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Salta 3 (WMTS)"
 
 msgid "IGN orthophoto Salta 4 (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Salta 4 (WMTS)"
 
 msgid "IGN orthophoto Salto Grande (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Salto Grande (WMTS)"
 
 msgid "IGN orthophoto San Juan (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto San Juan (WMTS)"
 
 msgid "IGN orthophoto San Luis (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto San Luis (WMTS)"
 
 msgid "IGN orthophoto Santa Cruz III (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Santa Cruz III (WMTS)"
 
 msgid "IGN orthophoto Santa Cruz IV (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Santa Cruz IV (WMTS)"
 
 msgid "IGN orthophoto Santa Cruz VI (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Santa Cruz VI (WMTS)"
 
 msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Santa Fe and Paraná (WMTS)"
 
 msgid "IGN orthophoto Tucumán (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Tucumán (WMTS)"
 
 msgid "IGN orthophoto Ushuaia (WMTS)"
-msgstr ""
+msgstr "IGN orthophoto Ushuaia (WMTS)"
 
 msgid "Educational map (WMS)"
-msgstr ""
+msgstr "Educational map (WMS)"
 
 msgid "Ministry of Agroindustry (WMS)"
-msgstr ""
+msgstr "Ministry of Agroindustry (WMS)"
 
 msgid "Ministry of Energy and Mining (WMS)"
-msgstr ""
+msgstr "Ministry of Energy and Mining (WMS)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
-msgstr ""
+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 ""
+msgstr "Tidal flats and islands at the coast (true colour)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
-msgstr ""
+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 black-and-white 2.5m"
@@ -25192,26 +25263,29 @@ msgstr "LPI NSW Administrative Boundaries State Forest"
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
-msgstr ""
+msgid "imagico.de: Northwest Heard Island"
+msgstr "imagico.de: Northwest Heard Island"
 
 msgid ""
 "Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
 msgstr ""
+"Glaciers of Northwest Heard Island (mapped meanwhile) (false colour IR)"
 
-msgid "imagico.de OSM images for mapping: Heard Island coast"
-msgstr ""
+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 "
 "well visible coast (true color)"
 msgstr ""
+"Recent image of Heard island with interior mostly cloud covered but mostly "
+"well visible coast (true colour)"
 
 msgid "basemap.at"
 msgstr "basemap.at"
 
 msgid "Basemap of Austria, based on goverment data."
-msgstr ""
+msgstr "Basemap of Austria, based on goverment data."
 
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
@@ -25219,6 +25293,7 @@ msgstr "basemap.at Orthofoto"
 msgid ""
 "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery."
 msgstr ""
+"Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery."
 
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
@@ -25233,13 +25308,13 @@ msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Surface model)"
 
 msgid "Tiris: contour lines"
-msgstr ""
+msgstr "Tiris: contour lines"
 
 msgid "Tiris: orthophoto"
-msgstr ""
+msgstr "Tiris: orthophoto"
 
 msgid "Tiris: orthophoto infrared"
-msgstr ""
+msgstr "Tiris: orthophoto infrared"
 
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (general purpose)"
@@ -25265,44 +25340,44 @@ 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 ""
+msgid "imagico.de: Rila and Pirin Mountains"
+msgstr "imagico.de: Rila and Pirin Mountains"
 
 msgid "OpenStreetMap (Belgian Style)"
-msgstr ""
+msgstr "OpenStreetMap (Belgian Style)"
 
 msgid "OpenStreetMap (Belgian Style - French)"
-msgstr ""
+msgstr "OpenStreetMap (Belgian Style - French)"
 
 msgid "OpenStreetMap (Belgian Style - Dutch)"
-msgstr ""
+msgstr "OpenStreetMap (Belgian Style - Dutch)"
 
 msgid "OpenStreetMap (Belgian Style - German)"
-msgstr ""
+msgstr "OpenStreetMap (Belgian Style - German)"
 
 msgid "Orthophoto IGN-NGI"
-msgstr ""
+msgstr "Orthophoto IGN-NGI"
 
 msgid "AGIV Flanders most recent aerial imagery"
-msgstr ""
+msgstr "AGIV Flanders most recent aerial imagery"
 
 msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
-msgstr ""
+msgstr "AGIV Flanders 2013-2015 aerial imagery 10cm"
 
 msgid "AGIV Flanders GRB"
-msgstr ""
+msgstr "AGIV Flanders GRB"
 
 msgid "URBISfr numerical imagery (2013)"
 msgstr "URBISfr numerical imagery (2013)"
 
 msgid "URBISfr numerical imagery"
-msgstr ""
+msgstr "URBISfr numerical imagery"
 
 msgid "URBISnl numerical imagery (2013)"
 msgstr "URBISnl numerical imagery (2013)"
 
 msgid "URBISnl numerical imagery"
-msgstr ""
+msgstr "URBISnl numerical imagery"
 
 msgid "URBIS 2009 aerial imagery"
 msgstr "URBIS 2009 aerial imagery"
@@ -25317,19 +25392,19 @@ msgid "URBIS 2015 aerial imagery"
 msgstr "URBIS 2015 aerial imagery"
 
 msgid "URBIS 2016 aerial imagery"
-msgstr ""
+msgstr "URBIS 2016 aerial imagery"
 
 msgid "URBIS 2017 aerial imagery"
-msgstr ""
+msgstr "URBIS 2017 aerial imagery"
 
 msgid "SPW(allonie) PICC numerical imagery"
 msgstr "SPW(allonie) PICC numerical imagery"
 
 msgid "SPW(allonie) most recent aerial imagery"
-msgstr ""
+msgstr "SPW(allonie) most recent aerial imagery"
 
 msgid "SPW(allonie) 2016 aerial imagery"
-msgstr ""
+msgstr "SPW(allonie) 2016 aerial imagery"
 
 msgid "SPW(allonie) 2015 aerial imagery"
 msgstr "SPW(allonie) 2015 aerial imagery"
@@ -25341,126 +25416,128 @@ msgid "SPW(allonie) 2009-2010 aerial imagery"
 msgstr "SPW(allonie) 2009-2010 aerial imagery"
 
 msgid "SPW(allonie) shaded relief"
-msgstr ""
+msgstr "SPW(allonie) shaded relief"
 
 msgid "TEC bus lines"
-msgstr ""
+msgstr "TEC bus lines"
 
 msgid "TEC bus stops"
-msgstr ""
+msgstr "TEC bus stops"
 
 msgid "Benin: Cotonou Pleiade 2016"
-msgstr ""
+msgstr "Benin: Cotonou Pleiade 2016"
 
-msgid "imagico.de OSM images for mapping: Cotonou"
-msgstr ""
+msgid "imagico.de: Cotonou"
+msgstr "imagico.de: Cotonou"
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
-msgstr ""
+msgstr "Patchy and partly cloudy coverage in usual sources (true colour)"
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
-msgstr ""
+msgid "imagico.de: Bouvet Island"
+msgstr "imagico.de: Bouvet Island"
 
 msgid "For more accurate coastline and glacier mapping (true color)"
-msgstr ""
+msgstr "For more accurate coastline and glacier mapping (true colour)"
 
 msgid "IBGE Map of urban areas"
-msgstr ""
+msgstr "IBGE Map of urban areas"
 
 msgid "IBGE Map of rural areas"
-msgstr ""
+msgstr "IBGE Map of rural areas"
 
 msgid "IBGE federal district"
-msgstr ""
+msgstr "IBGE federal district"
 
 msgid "Addresses data from IBGE"
-msgstr ""
+msgstr "Addresses data from IBGE"
 
 msgid "Street names IBGE Salvador-BA"
-msgstr ""
+msgstr "Street names IBGE Salvador-BA"
 
 msgid ""
 "Streets geometry and names of Salvador, Bahia. Source: Faces de Logradouro - "
 "IBGE."
 msgstr ""
+"Streets geometry and names of Salvador, Bahia. Source: Faces de Logradouro - "
+"IBGE."
 
 msgid "Rio Mosaic 2013"
-msgstr ""
+msgstr "Rio Mosaic 2013"
 
 msgid "Rio Mosaic 2015"
-msgstr ""
+msgstr "Rio Mosaic 2015"
 
 msgid "Londrina Ortofoto 2011"
-msgstr ""
+msgstr "Londrina Ortofoto 2011"
 
 msgid "SIG Santa Catarina OrtoRGB 2012"
-msgstr ""
+msgstr "SIG Santa Catarina OrtoRGB 2012"
 
 msgid "Arapiraca AL"
-msgstr ""
+msgstr "Arapiraca AL"
 
 msgid "Branquinha AL"
-msgstr ""
+msgstr "Branquinha AL"
 
 msgid "Cajueiro AL"
-msgstr ""
+msgstr "Cajueiro AL"
 
 msgid "Campo Alegre AL"
-msgstr ""
+msgstr "Campo Alegre AL"
 
 msgid "Capela AL"
-msgstr ""
+msgstr "Capela AL"
 
 msgid "Delmiro Gouveia AL"
-msgstr ""
+msgstr "Delmiro Gouveia AL"
 
 msgid "Estrela de Alagoas"
-msgstr ""
+msgstr "Estrela de Alagoas"
 
 msgid "Girau do Ponciano"
-msgstr ""
+msgstr "Girau do Ponciano"
 
 msgid "Major Isidoro AL"
-msgstr ""
+msgstr "Major Isidoro AL"
 
 msgid "Mar Vermelho AL"
-msgstr ""
+msgstr "Mar Vermelho AL"
 
 msgid "Minador do Negrão"
-msgstr ""
+msgstr "Minador do Negrão"
 
 msgid "Olho d’Agua do Casado AL"
-msgstr ""
+msgstr "Olho d’Agua do Casado AL"
 
 msgid "Palestina AL"
-msgstr ""
+msgstr "Palestina AL"
 
 msgid "Palmeira dos Indios AL"
-msgstr ""
+msgstr "Palmeira dos Indios AL"
 
 msgid "Pão de Açucar AL"
-msgstr ""
+msgstr "Pão de Açucar AL"
 
 msgid "Piranhas AL"
-msgstr ""
+msgstr "Piranhas AL"
 
 msgid "Poço das Trincheiras AL"
-msgstr ""
+msgstr "Poço das Trincheiras AL"
 
 msgid "Santana do Ipanema AL"
-msgstr ""
+msgstr "Santana do Ipanema AL"
 
 msgid "São Miguel dos Campos AL"
-msgstr ""
+msgstr "São Miguel dos Campos AL"
 
 msgid "Teotonio Vilela AL"
-msgstr ""
+msgstr "Teotonio Vilela AL"
 
 msgid "União dos Palmares AL"
-msgstr ""
+msgstr "União dos Palmares AL"
 
 msgid "Viçosa AL"
-msgstr ""
+msgstr "Viçosa AL"
 
 msgid "Alagoas coast 2006"
 msgstr ""
@@ -25526,34 +25603,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 ""
@@ -25561,7 +25637,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)"
@@ -25609,7 +25685,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -25617,7 +25693,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 ""
@@ -25788,8 +25864,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 ""
@@ -25797,9 +25872,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 ""
@@ -25807,10 +25880,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"
@@ -25843,57 +25916,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 ""
@@ -25901,13 +25969,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 ""
@@ -25975,13 +26043,13 @@ msgstr "OpenStreetMap Hungary (hiking routes)"
 msgid "Hillshade Hungary"
 msgstr "Hillshade Hungary"
 
-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 ""
@@ -25989,7 +26057,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -25997,7 +26065,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -26005,19 +26073,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 ""
@@ -26122,13 +26190,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 ""
@@ -26136,7 +26204,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)"
@@ -26230,13 +26298,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 ""
 
@@ -26324,6 +26385,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 ""
 
@@ -26332,6 +26407,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 ""
 
@@ -26339,13 +26438,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 ""
@@ -26359,7 +26458,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 ""
@@ -26367,29 +26466,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)"
@@ -26458,7 +26556,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"
@@ -26491,6 +26592,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 ""
 
@@ -26539,33 +26646,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 ""
@@ -26573,7 +26678,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)"
@@ -26619,25 +26724,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"
@@ -26661,7 +26766,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)"
@@ -26757,7 +26862,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 ""
@@ -26765,6 +26870,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"
 
@@ -26783,7 +26895,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)"
@@ -26845,7 +26957,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 ""
@@ -26853,13 +26965,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)"
@@ -26946,7 +27058,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 ""
@@ -26954,7 +27073,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"
@@ -26969,6 +27088,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"
 
@@ -27985,47 +28110,36 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr "{0} should have numbers only with optional .5 increments"
 
+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 is default; period is separator; if units, put space then unit"
 
 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}: tonne is default; period is separator; if units, put space then unit"
 
-msgid "unusual {0} format"
-msgstr "unusual {0} format"
+msgid "unusual value of {0}"
+msgstr "unusual value of {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}: kilometres is default; period is separator; if units, put space then "
-"unit"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr "voltage should be in volts with no units/delimiter/spaces"
 
-msgid "unusual {0} specification"
-msgstr "unusual {0} specification"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "unusual train track gauge; use mm with no separator"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr "unusual incline; use percentages/degrees or up/down"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} must be a numeric value"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} must be a positive integer number"
 
-msgid "unusual value of {0}"
-msgstr "unusual value of {0}"
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -28132,6 +28246,9 @@ msgstr "Hide icons at low zoom"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Less obtrusive node symbols at low zoom"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Display street labels (at high zoom)"
 
@@ -28186,6 +28303,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."
@@ -28229,6 +28349,9 @@ msgstr ""
 "Implements a command line and enables to create your commands. See link for "
 "standard commands (arc, circle etc.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -28285,6 +28408,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Handling of French EPCIs (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Use external scripts in JOSM"
 
@@ -28487,6 +28615,9 @@ msgid ""
 msgstr ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -29349,550 +29480,6 @@ msgstr "Import georeferenced image"
 msgid "Error while creating image layer: "
 msgstr "Error while creating image layer: "
 
-msgid "Mapillary Images"
-msgstr "Mapillary Images"
-
-msgid "Mapillary layer"
-msgstr "Mapillary layer"
-
-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 "Download Mapillary images in current view"
-
-msgid "Export pictures"
-msgstr "Export pictures"
-
-msgid "Export Mapillary pictures"
-msgstr "Export Mapillary pictures"
-
-msgid "Export images"
-msgstr "Export images"
-
-msgid "Import pictures"
-msgstr "Import pictures"
-
-msgid "Import local pictures"
-msgstr "Import local pictures"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Import pictures into Mapillary layer"
-
-msgid "Join mode"
-msgstr "Join mode"
-
-msgid "Join/unjoin pictures"
-msgstr "Join/unjoin pictures"
-
-msgid "Submit changeset"
-msgstr "Submit changeset"
-
-msgid "Submit the current changeset"
-msgstr "Submit the current changeset"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "Submit the current changeset to Mapillary"
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr "pending"
-
-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 "Walk mode"
-
-msgid "Zoom to selected image"
-msgstr "Zoom to selected image"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Zoom to the currently selected Mapillary image"
-
-msgid "Current Mapillary changeset"
-msgstr "Current Mapillary changeset"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Open Mapillary changeset dialogue"
-
-msgid "Mapillary changeset"
-msgstr "Mapillary changeset"
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr "Export all images"
-
-msgid "Export selected sequence"
-msgstr "Export selected sequence"
-
-msgid "Export selected images"
-msgstr "Export selected images"
-
-msgid "Rewrite imported images"
-msgstr "Rewrite imported images"
-
-msgid "Select a directory"
-msgstr "Select a directory"
-
-msgid "Explore"
-msgstr "Explore"
-
-msgid "Speed limit"
-msgstr "Speed limit"
-
-msgid "Give way"
-msgstr "Give way"
-
-msgid "No entry"
-msgstr "No entry"
-
-msgid "Intersection danger"
-msgstr "Intersection danger"
-
-msgid "Mandatory direction (any)"
-msgstr "Mandatory direction (any)"
-
-msgid "Uneven road"
-msgstr "Uneven road"
-
-msgid "No parking"
-msgstr "No parking"
-
-msgid "No overtaking"
-msgstr "No overtaking"
-
-msgid "Pedestrian crossing"
-msgstr "Pedestrian crossing"
-
-msgid "No turn"
-msgstr "No turn"
-
-msgid "Years"
-msgstr "Years"
-
-msgid "Months"
-msgstr "Months"
-
-msgid "Days"
-msgstr "Days"
-
-msgid "Imported images"
-msgstr "Imported images"
-
-msgid "Mapillary filter"
-msgstr "Mapillary filter"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Open Mapillary filter dialog"
-
-msgid "Not older than: "
-msgstr "Not older than: "
-
-msgid "Downloaded images"
-msgstr "Downloaded images"
-
-msgid "Only images with signs"
-msgstr "Only images with signs"
-
-msgid "Choose signs"
-msgstr "Choose signs"
-
-msgid "Mapillary history"
-msgstr "Mapillary history"
-
-msgid "Open Mapillary history dialog"
-msgstr "Open Mapillary history dialog"
-
-msgid "No image selected"
-msgstr "No image selected"
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr "Mapillary picture"
-
-msgid "Open Mapillary window"
-msgstr "Open Mapillary window"
-
-msgid "Next picture"
-msgstr "Next picture"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Shows the next picture in the sequence"
-
-msgid "Previous picture"
-msgstr "Previous picture"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Shows the previous picture in the sequence"
-
-msgid "Jump to red"
-msgstr "Jump to red"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Jumps to the picture at the other side of the red line"
-
-msgid "Jump to blue"
-msgstr "Jump to blue"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Jumps to the picture at the other side of the blue line"
-
-msgid "Stops the walk."
-msgstr "Stops the walk."
-
-msgid "Play"
-msgstr "Play"
-
-msgid "Continues with the paused walk."
-msgstr "Continues with the paused walk."
-
-msgid "Pause"
-msgstr "Pause"
-
-msgid "Pauses the walk."
-msgstr "Pauses the walk."
-
-msgid "Display hour when the picture was taken"
-msgstr "Display hour when the picture was taken"
-
-msgid "Use 24 hour format"
-msgstr "Use 24 hour format"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr "Move to picture''s location with next/previous buttons"
-
-msgid "Preview images when hovering its icon"
-msgstr "Preview images when hovering its icon"
-
-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 "Download mode"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr "You are logged in as ''{0}''."
-
-msgid "You are currently not logged in."
-msgstr "You are currently not logged in."
-
-msgid "Login"
-msgstr "Login"
-
-msgid "Logout"
-msgstr "Logout"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr "Go to setting and log in to Mapillary before uploading."
-
-msgid "Upload selected sequence"
-msgstr "Upload selected sequence"
-
-msgid "Delete after upload"
-msgstr "Delete after upload"
-
-msgid "Wait for full quality pictures"
-msgstr "Wait for full quality pictures"
-
-msgid "Follow selected image"
-msgstr "Follow selected image"
-
-msgid "Go forward"
-msgstr "Go forward"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr "Import"
-
-msgid "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] "Deleted {0} image"
-msgstr[1] "Deleted {0} images"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "Imported {0} image"
-msgstr[1] "Imported {0} images"
-
-msgid "2 images joined"
-msgstr "2 images joined"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "Moved {0} image"
-msgstr[1] "Moved {0} images"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "Turned {0} image"
-msgstr[1] "Turned {0} images"
-
-msgid "2 images unjoined"
-msgstr "2 images unjoined"
-
-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 "everything in the visible area"
-
-msgid "areas with downloaded OSM-data"
-msgstr "areas with downloaded OSM-data"
-
-msgid "only when manually requested"
-msgstr "only when manually requested"
-
-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 "Downloading"
-
-msgid "Select mode"
-msgstr "Select mode"
-
-msgid "Mapillary login"
-msgstr "Mapillary login"
-
-msgid "Login successful, return to JOSM."
-msgstr "Login successful, return to JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Supported image formats (JPG and PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "Downloading Mapillary images"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Total Mapillary images: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr "Submitting Mapillary Changeset"
-
-msgid "No images found"
-msgstr "No images found"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr "Finished upload"
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr "You are not logged in, please log in to Mapillary in the preferences"
-
-msgid "Not Logged in to Mapillary"
-msgstr "Not Logged in to Mapillary"
-
-msgid "Uploading: {0}"
-msgstr "Uploading: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -30698,6 +30285,110 @@ 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 ""
+"This tool can only replace a node, upgrade a node to a way or a "
+"multipolygon, or replace a way with a way."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "Node belongs to way(s), cannot replace."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr "Relation is not a multipolygon, cannot be used as a replacement."
+
+msgid "Replace geometry for node {0}"
+msgstr "Replace geometry for node {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "The ways must be entirely within the downloaded area."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr "Exceeded iteration limit for robust method, using simpler method."
+
+msgid "Replace geometry for way {0}"
+msgstr "Replace geometry for way {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Too many ways are added: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -30731,9 +30422,30 @@ msgstr "Buildings tags:"
 msgid "Cannot place building outside of the world."
 msgstr "Cannot place building outside of the world."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Create building"
 
+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 "Set buildings size"
 
@@ -30746,8 +30458,17 @@ msgstr "Auto-select building"
 msgid "Use address nodes under buildings"
 msgstr "Use address nodes under buildings"
 
-msgid "Buildings width:"
-msgstr "Buildings width:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Length step:"
@@ -31479,6 +31200,18 @@ msgstr "Delete the selected scheme from the list."
 msgid "Color Schemes"
 msgstr "Colour Schemes"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Abort tag editing and close dialogue"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Apply edited tags and close dialogue"
+
 msgid "Conflation"
 msgstr "Conflation"
 
@@ -31989,6 +31722,9 @@ msgstr "Open GeoChat panel"
 msgid "Zoom in to see messages"
 msgstr "Zoom in to see messages"
 
+msgid "Login"
+msgstr "Login"
+
 msgid "Enable autologin"
 msgstr "Enable autologin"
 
@@ -32021,24 +31757,15 @@ msgstr "Private chat"
 msgid "Close tab"
 msgstr "Close tab"
 
+msgid "Logout"
+msgstr "Logout"
+
 msgid "Clear log"
 msgstr "Clear log"
 
 msgid "Show users on map"
 msgstr "Show users on map"
 
-msgid "GeoJSON file"
-msgstr "GeoJSON file"
-
-msgid "Loading json file..."
-msgstr "Loading JSON file..."
-
-msgid "Data Layer from GeoJSON: "
-msgstr "Data Layer from GeoJSON: "
-
-msgid "Error loading geojson file {0}"
-msgstr "Error loading GeoJSON file {0}"
-
 msgid "Position only"
 msgstr "Position only"
 
@@ -32129,6 +31856,9 @@ msgstr "Globalsat Import"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Import Data from Globalsat Datalogger DG100 into GPX layer."
 
+msgid "Import"
+msgstr "Import"
+
 msgid "GPS Blams"
 msgstr "GPS Blams"
 
@@ -32864,8 +32594,26 @@ msgstr "Structure type:"
 msgid "Offset into background:"
 msgstr "Offset into background:"
 
-msgid "Indoor Mapping Helper"
-msgstr "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"
 msgstr "POWER"
@@ -32897,36 +32645,94 @@ msgstr "Sets the ref tag when the room-object is selected."
 msgid "Apply Tags"
 msgstr "Apply Tags"
 
-msgid "Fitting"
-msgstr "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 ""
-"<html>Please mind to start fitting your building-plans now.<br>To do so, use "
-"the PicLayer plug-in, which you can install<br>using the JOSM plug-in "
-"management.</html>"
-
-msgid "Level Selection"
-msgstr "Level Selection"
 
-msgid "Lowest Level"
-msgstr "Lowest Level"
-
-msgid "The lowest level of your building."
-msgstr "The lowest level of your building."
+msgid "level number:"
+msgstr ""
 
-msgid "Highest Level"
-msgstr "Highest Level"
+msgid "Example: ''2'' or ''3''"
+msgstr ""
 
-msgid "The highest level of your building."
-msgstr "The highest level of your building."
+msgid "Indoor Mapping Helper"
+msgstr "Indoor Mapping Helper"
 
 msgid "Toolbox for indoor mapping assistance"
 msgstr "Toolbox for indoor mapping assistance"
 
+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"
 
@@ -34073,6 +33879,27 @@ msgstr "Unknown file extension: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Parsing file \"{0}\" failed"
 
+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"
 
@@ -34411,6 +34238,9 @@ msgstr "Edit Photo GPS Data"
 msgid "Please select an image first."
 msgstr "Please select an image first."
 
+msgid "No image selected"
+msgstr "No image selected"
+
 msgid "(Empty values delete the according fields.)"
 msgstr "(Empty values delete the according fields.)"
 
@@ -35159,6 +34989,9 @@ msgstr "implicit"
 msgid "State"
 msgstr "State"
 
+msgid "pending"
+msgstr "pending"
+
 msgid "[incomplete]"
 msgstr "[incomplete]"
 
@@ -35577,12 +35410,6 @@ msgstr "New value for {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr "Preference ''{0}'' missing. Cannot initialise SdsApi."
 
-msgid "Failed to open connection to API {0}."
-msgstr "Failed to open connection to API {0}"
-
-msgid "Proxy Authentication Required"
-msgstr "Proxy Authentication Required"
-
 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>"
@@ -35943,12 +35770,6 @@ msgstr "JOSM Tag Editor Plug-in"
 msgid "Presets"
 msgstr "Presets"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Abort tag editing and close dialogue"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Apply edited tags and close dialogue"
-
 msgid "Highlight"
 msgstr "Highlight"
 
@@ -37635,45 +37456,6 @@ msgstr ""
 "This tool replaces geometry of one object with another, and so requires "
 "exactly two objects to be selected."
 
-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 ""
-"This tool can only replace a node, upgrade a node to a way or a "
-"multipolygon, or replace a way with a way."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "Node belongs to way(s), cannot replace."
-
-msgid "Replace geometry for node {0}"
-msgstr "Replace geometry for node {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr "Relation is not a multipolygon, cannot be used as a replacement."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "The ways must be entirely within the downloaded area."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr "Exceeded iteration limit for robust method, using simpler method."
-
-msgid "Replace geometry for way {0}"
-msgstr "Replace geometry for way {0}"
-
 msgid "Replace Membership"
 msgstr "Replace Membership"
 
@@ -37749,9 +37531,6 @@ msgstr "Select middle nodes"
 msgid "Please select two nodes connected by way!"
 msgstr "Please select two nodes connected by way!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Too many ways are added: {0}!"
-
 msgid "All inside [testing]"
 msgstr "All inside [testing]"
 
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index 6a52e41..1bbc534 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2016-09-21 04:23+0000\n"
 "Last-Translator: Yuri Tretyakov <Unknown>\n"
 "Language-Team: Esperanto <eo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:41+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:41+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: eo\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -953,8 +953,8 @@ msgstr ""
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
-msgstr "Apartigu tavolojn"
+msgid "Download as new layer"
+msgstr ""
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr ""
@@ -2251,12 +2251,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"
@@ -8253,9 +8253,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>"
@@ -9712,6 +9709,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12754,9 +12754,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 ""
 
@@ -14449,6 +14446,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 ""
 
@@ -14458,10 +14459,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 ""
@@ -16285,10 +16282,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17774,6 +17767,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17795,6 +17791,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20448,6 +20447,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23519,6 +23524,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 ""
 
@@ -23600,7 +23632,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23615,7 +23647,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 ""
@@ -23623,21 +23655,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 ""
 
@@ -23776,13 +23830,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"
@@ -23815,14 +23869,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 ""
@@ -23888,7 +23942,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)"
@@ -23975,13 +24029,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)"
@@ -24149,34 +24203,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 ""
@@ -24184,7 +24237,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)"
@@ -24232,7 +24285,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24240,7 +24293,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 ""
@@ -24409,8 +24462,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 ""
@@ -24418,9 +24470,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 ""
@@ -24428,10 +24478,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"
@@ -24464,57 +24514,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 ""
@@ -24522,13 +24567,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 ""
@@ -24596,13 +24641,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 ""
@@ -24610,7 +24655,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24618,7 +24663,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24626,19 +24671,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 ""
@@ -24743,13 +24788,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 ""
@@ -24757,7 +24802,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)"
@@ -24851,13 +24896,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 ""
 
@@ -24945,6 +24983,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 ""
 
@@ -24953,6 +25005,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 ""
 
@@ -24960,13 +25036,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 ""
@@ -24980,7 +25056,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 ""
@@ -24988,29 +25064,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)"
@@ -25079,7 +25154,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"
@@ -25112,6 +25190,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 ""
 
@@ -25160,33 +25244,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 ""
@@ -25194,7 +25276,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)"
@@ -25240,25 +25322,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"
@@ -25282,7 +25364,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)"
@@ -25378,7 +25460,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 ""
@@ -25386,6 +25468,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 ""
 
@@ -25404,7 +25493,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)"
@@ -25466,7 +25555,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 ""
@@ -25474,13 +25563,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)"
@@ -25567,7 +25656,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 ""
@@ -25575,7 +25671,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"
@@ -25590,6 +25686,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26581,32 +26683,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"
@@ -26615,9 +26713,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 ""
 
@@ -26724,6 +26819,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 ""
 
@@ -26767,6 +26865,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."
@@ -26800,6 +26901,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26847,6 +26951,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 ""
 
@@ -27012,6 +27121,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 ""
@@ -27801,550 +27913,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 ""
 
@@ -29039,6 +28607,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 ""
 
@@ -29072,9 +28738,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 ""
 
@@ -29087,7 +28774,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:"
@@ -29766,6 +29462,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 ""
 
@@ -30260,6 +29968,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30292,22 +30003,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"
@@ -30397,6 +30099,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31086,7 +30791,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"
@@ -31119,31 +30842,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"
@@ -32224,6 +32008,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 ""
 
@@ -32557,6 +32362,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33294,6 +33102,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33704,12 +33515,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>"
@@ -34046,12 +33851,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35592,39 +35391,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 ""
 
@@ -35698,9 +35464,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/es.po b/i18n/po/es.po
index d9fb521..c7f5419 100644
--- a/i18n/po/es.po
+++ b/i18n/po/es.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-29 10:36+0000\n"
-"Last-Translator: Roberto Geb <Unknown>\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-27 14:40+0000\n"
+"Last-Translator: pertile <leopoldofederico at gmail.com>\n"
 "Language-Team: Spanish <es at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:02+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:02+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: es\n"
 "X-Language: es_ES\n"
 "X-Source-Language: C\n"
@@ -1039,8 +1039,8 @@ msgstr "Introduzca la URL a descargar"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Introduzca una URL desde donde los datos deben ser descargados"
 
-msgid "Separate Layer"
-msgstr "Separar capa"
+msgid "Download as new layer"
+msgstr "Descargar como nueva capa"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Seleccionar si los datos deben ser descargados en una nueva capa"
@@ -2471,17 +2471,17 @@ msgstr "Convertir a capa GPX comenzando desde el último miembro"
 
 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 ""
-"Aplanar recursivamente esta relación a una única traza gpx, comenzando con "
-"el/los primero/s miembro/s, continuando sucesivamente hasta el último."
+"Aplanar recursivamente esta relación a una sola pista gpx, comenzando con el "
+"primer miembro y sucesivamente hasta llegar al último."
 
 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 ""
-"Aplanar recursivamente esta relación a una única traza gpx, comenzando con "
-"el/los ultimo/s miembro/s, continuando sucesivamente hasta el primero."
+"Aplanar recursivamente esta relación a una sola pista gpx, comenzando con el "
+"último miembro y sucesivamente hasta llegar al primero."
 
 msgid "Selected Relations"
 msgstr "Relaciones seleccionadas"
@@ -9090,9 +9090,6 @@ msgstr "Para la latitud se requiere un valor en el rango [-90,90]."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Para la longitud se requiere un valor en el rango [-180,180]."
 
-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>"
@@ -10789,6 +10786,9 @@ msgstr "No se encontraron datos en el archivo ''{0}''."
 msgid "Open OSM file"
 msgstr "Abrir archivo OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr "Archivos XZ del servidor OSM comprimidos"
+
 msgid "Validation Error Files"
 msgstr "Archivos de errores de validación"
 
@@ -11858,7 +11858,7 @@ msgstr ""
 "Nombre de archivo de imagen de salida (.png); predeterminado a ''{0}''"
 
 msgid "Style file to use for rendering (.mapcss or .zip)"
-msgstr ""
+msgstr "Archivo de estilo utilizado para la representación (.mapcss o .zip)"
 
 msgid "This option can be repeated to load multiple styles."
 msgstr "Esta opción puede ser repetida para cargar múltiples estilos."
@@ -11866,13 +11866,17 @@ msgstr "Esta opción puede ser repetida para cargar múltiples estilos."
 msgid ""
 "Style setting (in JOSM accessible in the style list dialog right click menu)"
 msgstr ""
+"Preferencias de estilo (en JOSM se puede acceder mediante el diálogo de "
+"lista de estilos con el menú contextual)"
 
 msgid "Applies to the last style loaded with the {0} option."
-msgstr ""
+msgstr "Aplica al último estilo cargado con la opción {0}"
 
 msgid ""
 "Select zoom level to render. (integer value, 0=entire earth, 18=street level)"
 msgstr ""
+"Seleccione el nivel de acercamiento para representar gráficamente (valor "
+"entero, 0=toda la Tierra, 18=nivel de calle)"
 
 msgid "Select the map scale"
 msgstr "Seleccionar la escala del mapa"
@@ -11881,9 +11885,12 @@ msgid ""
 "A value of 10000 denotes a scale of 1:10000 (1 cm on the map equals 100 m on "
 "the ground; display resolution: 96 dpi)"
 msgstr ""
+"Un valor de 10000 equivale a una escala de 1:10000 (1 cm en el mapa "
+"equivalen a 100 metros en el terreno; la resolución de visualización es de "
+"96 ppp)"
 
 msgid "Options {0} and {1} are mutually exclusive."
-msgstr ""
+msgstr "Las opciones {0} y {1} son mutuamente exclusivas."
 
 msgid "Area to render, default value is ''{0}''"
 msgstr "Área a interpretar, el valor por defecto es ''{0}''"
@@ -11892,6 +11899,8 @@ msgid ""
 "With keyword ''{0}'', the downloaded area in the .osm input file will be "
 "used (if recorded)."
 msgstr ""
+"Con la palabra clave ''{0}'', se utilizará el área descargada en el archivo "
+"de entrada .osm (si es que fue registrado)."
 
 msgid "Specify bottom left corner of the rendering area"
 msgstr "Especificar la esquina inferior izquierda del área de interpretado"
@@ -11900,18 +11909,20 @@ msgid ""
 "Used in combination with width and height options to determine the area to "
 "render."
 msgstr ""
+"Utilizado en combinación con las opciones de alto y ancho para determinar el "
+"área a representar."
 
 msgid "Width of the rendered area, in meter"
-msgstr ""
+msgstr "Ancho del área representada en metros"
 
 msgid "Height of the rendered area, in meter"
-msgstr ""
+msgstr "Alto del área representada en metros"
 
 msgid "Width of the target image, in pixel"
-msgstr ""
+msgstr "Ancho de la imagen objetivo en píxeles"
 
 msgid "Height of the target image, in pixel"
-msgstr ""
+msgstr "Alto de la imagen objetivo en píxeles"
 
 msgid "Projection to use, default value ''{0}'' (web-Mercator)"
 msgstr "Proyección a usar, valor por defecto ''{0}'' (web-Mercator)"
@@ -11920,36 +11931,49 @@ msgid ""
 "Maximum image width/height in pixel (''{0}'' means no limit), default value: "
 "{1}"
 msgstr ""
+"Ancho/alto máximo de la imagen en píxeles (''{0}'' significa sin límite), "
+"valor por defecto: {1}"
 
 msgid ""
 "To specify the rendered area and scale, the options can be combined in "
 "various ways"
 msgstr ""
+"Para especificar el área representada y la escala, las opciones se pueden "
+"combinar de distintas maneras"
 
 msgid ""
 "If neither ''{0}'' nor ''{1}'' is given, the default value {2} takes effect "
 "and the bounds of the download area in the .osm input file are used."
 msgstr ""
+"Si no se especifica ''{0}'' ni ''{1}'', se utiliza el valor por defecto {2} "
+"lo que implica que se toman los límites del área descargada en el archivo de "
+"entrada .osm."
 
 msgid ""
 "Argument {0} given, but scale cannot be determined from remaining arguments"
 msgstr ""
+"Se especificó el argumento {0}, pero la escala no puede ser determinada a "
+"partir de los demás argumentos"
 
 msgid "Argument {0} given, expected {1} or {2}"
 msgstr "Recibido argumento {0}, se esperaba {1} o {2}"
 
 msgid "{0} mode, but no bounds found in osm data input file"
 msgstr ""
+"Modo {0}, pero no se encontraron límites en el archivo osm de datos de "
+"entrada"
 
 msgid ""
 "Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
 msgstr ""
+"No se pudo determinar la escala, se esperaba alguna de las opciones {0}, "
+"{1}, {2} o {3}"
 
 msgid "Missing argument - input data file ({0})"
 msgstr "Falta argumento - archivo de datos de entrada ({0})"
 
 msgid "In .osm data file ''{0}'' - "
-msgstr ""
+msgstr "En el archivo de datos .osm ''{0}'' - "
 
 msgid "Missing argument - at least one style expected ({0})"
 msgstr "Falta argumento - se esperaba al menos un estilo ({0})"
@@ -11958,6 +11982,8 @@ msgid ""
 "Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
 "change limit)"
 msgstr ""
+"Las dimensiones de la imagen ({0}x{1}) sobrepasan el tamaño máximo de la "
+"imagen {2} (utilice la opción {3} para modificar los límites)"
 
 msgid "Style setting not found: ''{0}''"
 msgstr "Opción de estilo no encontrada: ''{0}''"
@@ -13343,7 +13369,7 @@ msgid "Show object ID in selection lists"
 msgstr "Mostrar el identificador del objeto en las listas de selección"
 
 msgid "Show node coordinates in selection lists"
-msgstr ""
+msgstr "Mostrar coordenadas de nodos en listas de selección"
 
 msgid "Show localized name in selection lists"
 msgstr "Mostrar nombre localizado en listas de selección"
@@ -14192,9 +14218,6 @@ msgstr "Control Remoto"
 msgid "Settings for the remote control feature."
 msgstr "Ajustes para la función de control remoto."
 
-msgid "Download objects to new layer"
-msgstr "Descargar los objetos en capa nueva"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Confirmar todas las acciones de Control Remoto manualmente."
 
@@ -14980,6 +15003,8 @@ msgid ""
 "Way {0} with {1} nodes is incomplete because at least one node was missing "
 "in the loaded data."
 msgstr ""
+"La vía {0} con {1} nodos está incompleto debido a que al menos un nodo se "
+"perdió en los datos cargados."
 
 msgid ""
 "Relation with external id ''{0}'' refers to a missing primitive with "
@@ -15739,10 +15764,10 @@ msgid "Do you want to allow this?"
 msgstr "¿Desea permitir esto?"
 
 msgid "Yes, always"
-msgstr ""
+msgstr "Sí, siempre"
 
 msgid "Yes, once"
-msgstr ""
+msgstr "Sí, solo esta vez"
 
 msgid "Confirm Remote Control action"
 msgstr "Confirmar la acción del control remoto"
@@ -15902,12 +15927,13 @@ msgstr "se esperaba un archivo .jos dentro del archivo .joz"
 
 msgid "Failed to create missing plugin preferences directory: {0}"
 msgstr ""
+"Hubo una falla al crear el directorio de preferencias de complementos: {0}"
 
 msgid "Failed to create missing plugin user data directory: {0}"
-msgstr ""
+msgstr "Hubo una falla al crear el directorio de datos de usuario¿: {0}"
 
 msgid "Failed to create missing plugin cache directory: {0}"
-msgstr ""
+msgstr "Hubo una falla al crear el directorio de memoria rápida: {0}"
 
 msgid "Skip download"
 msgstr "Saltar descarga"
@@ -16150,6 +16176,12 @@ msgstr "Mantener complemento"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Elija para mantener el complemento \"{0}\""
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Error al instalar el complemento ''{0}'' desde el archivo de descarga "
+"temporal ''{1}''. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Error al eliminar los complementos obsoletos ''{0}''."
 
@@ -16161,12 +16193,6 @@ msgstr ""
 "instalación. JOSM va a cargar la vieja versión del complemento."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Error al instalar el complemento ''{0}'' desde el archivo de descarga "
-"temporal ''{1}''. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -17644,7 +17670,7 @@ msgid "korean"
 msgstr "coreana"
 
 msgid "donut"
-msgstr ""
+msgstr "donas"
 
 msgid "mediterranean"
 msgstr "mediterránea"
@@ -17653,7 +17679,7 @@ msgid "friture"
 msgstr "fritura"
 
 msgid "crepe"
-msgstr ""
+msgstr "crepe"
 
 msgid "Internet access"
 msgstr "Acceso a Internet"
@@ -18180,10 +18206,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "azotea"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "gabinete"
-
 msgid "Start date"
 msgstr "Fecha de inicio"
 
@@ -19702,6 +19724,9 @@ msgstr "Bio Diesel"
 msgid "Octane 80"
 msgstr "80 octanos"
 
+msgid "Octane 87"
+msgstr "87 octanos"
+
 msgid "Octane 91"
 msgstr "91 octanos"
 
@@ -19723,6 +19748,9 @@ msgstr "E10 (mezcla al 10% de etanol)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (mezcla al 85% de etanol)"
 
+msgid "Ethanol (alcohol)"
+msgstr "etanol (alcohol)"
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GLP (Gas licuado de petróleo)"
 
@@ -20013,7 +20041,7 @@ msgid "Additives:"
 msgstr "Aditivos:"
 
 msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
-msgstr ""
+msgstr "Fluido de escape diésel (AdBlue/AUS32)"
 
 msgid "Fuel cards:"
 msgstr "Tarjetas de combustible:"
@@ -20546,10 +20574,10 @@ msgid "Caravans allowed"
 msgstr "Caravanas permitidas"
 
 msgid "Backcountry"
-msgstr ""
+msgstr "descampado (sin instalaciones)"
 
 msgid "Group only access"
-msgstr ""
+msgstr "Exclusivo para miembros de un grupo"
 
 msgid "Food+Drinks"
 msgstr "Comida+Bebidas"
@@ -21257,7 +21285,7 @@ msgstr ""
 "psíquicos, etc)"
 
 msgid "Nursing Home (Legacy)"
-msgstr ""
+msgstr "Geriátrico (en desuso)"
 
 msgid "Group Home"
 msgstr "Hogar de acogida"
@@ -21473,7 +21501,7 @@ msgid "trash"
 msgstr "papelera"
 
 msgid "dog_excrement"
-msgstr ""
+msgstr "excremento de perro"
 
 msgid "Waste Disposal/Dumpster"
 msgstr "Contenedor de residuos"
@@ -22385,6 +22413,12 @@ msgstr "Fuente o surtidor ornamental"
 msgid "Water Well"
 msgstr "Pozo de agua"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Faro"
 
@@ -22994,15 +23028,15 @@ msgstr "mecánica"
 
 msgctxt "power"
 msgid "circuit_breaker"
-msgstr ""
+msgstr "disyuntor"
 
 msgctxt "power"
 msgid "disconnector"
-msgstr ""
+msgstr "seccionador"
 
 msgctxt "power"
 msgid "earthing"
-msgstr ""
+msgstr "toma a tierra"
 
 msgid "Power Converter"
 msgstr "Conversor de energía"
@@ -23271,13 +23305,13 @@ msgid "Pole"
 msgstr "Poste"
 
 msgid "Pole with Switch"
-msgstr ""
+msgstr "Poste con interruptor"
 
 msgid "Pole Attributes:"
 msgstr "Atributos del poste:"
 
 msgid "Switch Attributes:"
-msgstr ""
+msgstr "Atributos del interruptor:"
 
 msgid "Pole with Transformer"
 msgstr "Poste con transformador"
@@ -23396,10 +23430,10 @@ msgid "Palaeontological Site"
 msgstr "Sitio paleontológico"
 
 msgid "Grave"
-msgstr "Tumba"
+msgstr "Sepultura"
 
 msgid "Tomb"
-msgstr ""
+msgstr "Tumba"
 
 msgctxt "tomb"
 msgid "tumulus"
@@ -23407,7 +23441,7 @@ msgstr "Túmulo"
 
 msgctxt "tomb"
 msgid "rock-cut"
-msgstr ""
+msgstr "Excavado en la roca"
 
 msgctxt "tomb"
 msgid "hypogeum"
@@ -23415,7 +23449,7 @@ msgstr "hipogeo"
 
 msgctxt "tomb"
 msgid "war_grave"
-msgstr ""
+msgstr "cementerio militar"
 
 msgctxt "tomb"
 msgid "mausoleum"
@@ -23439,7 +23473,7 @@ msgstr "sarcófago"
 
 msgctxt "tomb"
 msgid "vault"
-msgstr ""
+msgstr "panteón"
 
 msgid "Monument"
 msgstr "Monumento"
@@ -24222,7 +24256,7 @@ msgstr ""
 "distritos, etc.)"
 
 msgid "Quarter"
-msgstr ""
+msgstr "Distrito urbano (quarter)"
 
 msgid "Neighbourhood"
 msgstr ""
@@ -24433,7 +24467,7 @@ msgstr ""
 "Una acumulación de rocas redondeadas sueltas en una playa o lecho de río."
 
 msgid "Fell"
-msgstr "Braña"
+msgstr "Braña o estiva"
 
 msgid ""
 "Bare upper lying uncultivated land principally covered with grass and often "
@@ -24593,7 +24627,7 @@ msgid "Plant Nursery"
 msgstr "Vivero de plantas"
 
 msgid "Salt Pond"
-msgstr ""
+msgstr "salina"
 
 msgid "Aquaculture"
 msgstr "Acuicultura"
@@ -24682,7 +24716,7 @@ msgstr "molino"
 
 msgctxt "industrial"
 msgid "heating_station"
-msgstr ""
+msgstr "central de calefacción urbana"
 
 msgctxt "industrial"
 msgid "machine_shop"
@@ -24702,7 +24736,7 @@ msgstr "puerto"
 
 msgctxt "industrial"
 msgid "salt_pond"
-msgstr ""
+msgstr "salina"
 
 msgctxt "industrial"
 msgid "sawmill"
@@ -25424,14 +25458,20 @@ msgid ""
 "select regions filled with +Vivid or custom area of interest imagery, 50cm "
 "resolution or better, and refreshed more frequently with ongoing updates."
 msgstr ""
+"DigitalGlobe-Premium es un mosaico compuesto por el mapa base de "
+"DigitalGlobe más regiones seleccionadas con +Vivid o áreas personalizadas de "
+"imágenes aéreas de interés, de 50 cm o más resolución, que se actualizan más "
+"frecuentemente con las actualizaciones en curso.."
 
 msgid "DigitalGlobe Premium Imagery Vintage"
-msgstr ""
+msgstr "Imágenes aéreas de DigitalGlobe Premium Vintage"
 
 msgid ""
 "Imagery boundaries and capture dates. Labels appear at zoom level 14 and "
 "higher."
 msgstr ""
+"Límites de imágenes aéreas y fechas de captura. Las etiquetas aparecen a un "
+"nivel de acercamiento de 14 o superior."
 
 msgid "DigitalGlobe Standard Imagery"
 msgstr "Imágenes de DigitalGlobe Standard"
@@ -25441,12 +25481,17 @@ msgid ""
 "earth’s landmass, with 30-60cm or resolution where available, backfilled by "
 "Landsat. Average age is 2.31 years, with some areas updated 2x per year."
 msgstr ""
+"DigitalGlobe-Standard es un conjunto de imágenes organizado que cubre el 86% "
+"de las masas de tierra, con entre 30 y 60 cm de resolución donde estén "
+"disponibles, cubiertas por Landsat. La edad promedio es de 2,31 años, "
+"mientras que en algunas áreas la actualización llega a realizarse dos veces "
+"en un año."
 
 msgid "DigitalGlobe Standard Imagery Vintage"
-msgstr ""
+msgstr "Imágenes aéreas de DigitalGlobe Standard Imagery"
 
 msgid "Esri World Imagery"
-msgstr ""
+msgstr "Imágenes aéreas de Esri Mundial"
 
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
@@ -25488,10 +25533,45 @@ msgid "Hike & Bike"
 msgstr "Ciclismo & Montañismo"
 
 msgid "OpenSnowMap overlay"
-msgstr ""
+msgstr "Superposición de OpenSnowMap"
 
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
+"Superposición de imágenes para el mapeo de pistas en OSM. Actualizado de "
+"forma diaria."
+
+msgid "OpenRailwayMap"
+msgstr "OpenRailwayMap"
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr "Imágenes superpuestas para el mapeo de vías férreas en OSM"
+
+msgid "OpenInfraMap Telecoms"
+msgstr "OpenInfraMap Telecomunicaciones"
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Superposición de imágenes para el mapeo de infraestructura de "
+"telecomunicaciones en OSM. Actualizado de forma diaria."
+
+msgid "OpenInfraMap Power"
+msgstr "OpenInfraMap Energía"
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Superposición de imágenes para el mapeo de infraestructura de la red "
+"eléctrica en OSM. Actualizado de forma diaria."
+
+msgid "OpenInfraMap Petroleum"
+msgstr "OpenInfraMap Petróleo"
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Superposición de imágenes para el mapeo de infraestructura de petróleo en "
+"OSM. Actualizado de forma diaria."
 
 msgid "skobbler"
 msgstr "skobbler"
@@ -25500,7 +25580,7 @@ msgid "Stamen Terrain"
 msgstr "Terrain de Stamen"
 
 msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
-msgstr ""
+msgstr "Camboya, Laos, Tailandia, Vietnam, Malasia y Birmania bilingües"
 
 msgid "OpenPT Map (overlay)"
 msgstr "OpenPT Map (superposición)"
@@ -25515,10 +25595,10 @@ msgid "Strava cycling and running heatmap"
 msgstr "Strava - Mapa de calor de ciclismo y running"
 
 msgid "Strava water sports heatmap"
-msgstr ""
+msgstr "mapa de calor de deportes acuáticos de Strava"
 
 msgid "Strava winter sports heatmap"
-msgstr ""
+msgstr "Mapa de calor de deportes de invierno de Strava"
 
 msgid "Locator Overlay"
 msgstr "Superponer ubicador"
@@ -25574,7 +25654,7 @@ msgstr "OSM Inspector: Direcciones"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM Inspector: Línea costera (EU)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr "Imágenes de imagico.de: Montes Prokletije"
 
 msgid ""
@@ -25585,13 +25665,15 @@ msgstr ""
 "severas debido a nubes y nieve (color verdadero)"
 
 msgid "Municipality of Tirana (Open Labs GeoPortal)"
-msgstr ""
+msgstr "Municipalidad de Tirana (Open Labs GeoPortal)"
 
 msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
+"Calles y edificios provistos por la Municipalidad de Tirana, alojados en "
+"Open Labs"
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
+msgid "imagico.de: Southern Transantarctic Mountains"
 msgstr "Imágenes de imagico.de: Montañas Transantárticas del Sur"
 
 msgid ""
@@ -25601,10 +25683,10 @@ msgstr ""
 "Por fuera de la cobertura regular de Landsat y por tanto no está en LIMA ni "
 "en Bing/Mapbox (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
 msgstr "Imágenes de imagico.de: Montañas Pensacola"
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: Elephant Island/Clarence Island"
 msgstr "Imágenes de imagico.de: Isla Elefante/Isla Clarence"
 
 msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
@@ -25612,15 +25694,36 @@ msgstr ""
 "Imagen lo suficientemente despejada y actualizada como para atualizar los "
 "bordes de glaciares (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgid "imagico.de: Bunger Hills"
 msgstr ""
-"Imágenes OSM de imagico.de para mapeo: Tierra de Enderby y Costa de Kemp"
+
+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: Tierra de Enderby y Costa de Kemp"
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 "Imágenes Sentinel-2 de la Tierra de Enderby Land y la Costa de Kemp (color "
 "verdadero)"
 
+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 "Mapa topográfico de IGN (TMS)"
 
@@ -25631,142 +25734,142 @@ msgid "IGN topographical map (WMS)"
 msgstr "Mapa topográfico de IGN (WMS)"
 
 msgid "IGN orthophoto AMBA a (WMTS)"
-msgstr ""
+msgstr "Ortofoto del Área Metropolitana Buenos Aires a del IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA b (WMTS)"
-msgstr ""
+msgstr "Ortofoto del Área Metropolitana Buenos Aires b del IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA c (WMTS)"
-msgstr ""
+msgstr "Ortofoto del Área Metropolitana Buenos Aires c del IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA d (WMTS)"
-msgstr ""
+msgstr "Ortofoto del Área Metropolitana Buenos Aires d del IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA e (WMTS)"
-msgstr ""
+msgstr "Ortofoto del Área Metropolitana Buenos Aires e del IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA f (WMTS)"
-msgstr ""
+msgstr "Ortofoto del Área Metropolitana Buenos Aires f del IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA 4 (WMTS)"
-msgstr ""
+msgstr "Ortofoto del Área Metropolitana Buenos Aires 4 del IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA 5 (WMTS)"
-msgstr ""
+msgstr "Ortofoto del Área Metropolitana Buenos Aires 5 del IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA 6 (WMTS)"
-msgstr ""
+msgstr "Ortofoto del Área Metropolitana Buenos Aires 6 del IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA 7 (WMTS)"
-msgstr ""
+msgstr "Ortofoto del Área Metropolitana Buenos Aires 7 del IGN (WMTS)"
 
 msgid "IGN orthophoto Barranqueras (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Barranqueras y alrededores del IGN (WMTS)"
 
 msgid "IGN orthophoto Catamarca (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Catamarca del IGN (WMTS)"
 
 msgid "IGN orthophoto Córdoba (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Córdoba del IGN (WMTS)"
 
 msgid "IGN orthophoto El Calafate (WMTS)"
-msgstr ""
+msgstr "Ortofoto de El Calafate del IGN (WMTS)"
 
 msgid "IGN orthophoto El Rodeo (WMTS)"
-msgstr ""
+msgstr "Ortofoto de El Rodeo del IGN (WMTS)"
 
 msgid "IGN orthophoto Jujuy (WMTS)"
 msgstr "IGN ortofoto Jujuy (WMTS)"
 
 msgid "IGN orthophoto La Rioja (WMTS)"
-msgstr ""
+msgstr "Ortofoto de La Rioja, Argentina, del IGN (WMTS)"
 
 msgid "IGN orthophoto Mendoza (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Mendoza del IGN (WMTS)"
 
 msgid "IGN orthophoto Neuquén (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Neuquén del IGN (WMTS)"
 
 msgid "IGN orthophoto Posadas (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Posadas del IGN (WMTS)"
 
 msgid "IGN orthophoto Resistencia (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Resistencia y alrededores del IGN (WMTS)"
 
 msgid "IGN orthophoto Río Gallegos (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Río Gallegos del IGN (WMTS)"
 
 msgid "IGN orthophoto Río Grande (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Río Grande del IGN (WMTS)"
 
 msgid "IGN orthophoto Río Paraná A (WMTS)"
-msgstr ""
+msgstr "Ortofoto del río Paraná A del IGN (WMTS)"
 
 msgid "IGN orthophoto Río Paraná B (WMTS)"
-msgstr ""
+msgstr "Ortofoto del río Paraná B del IGN (WMTS)"
 
 msgid "IGN orthophoto Rosario (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Rosario del IGN (WMTS)"
 
 msgid "IGN orthophoto Salta (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Salta del IGN (WMTS)"
 
 msgid "IGN orthophoto Salta 1 (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Salta 1 del IGN (WMTS)"
 
 msgid "IGN orthophoto Salta 2 (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Salta 2 del IGN (WMTS)"
 
 msgid "IGN orthophoto Salta 3 (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Salta 3 del IGN (WMTS)"
 
 msgid "IGN orthophoto Salta 4 (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Salta 4 del IGN (WMTS)"
 
 msgid "IGN orthophoto Salto Grande (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Salto Grande del IGN (WMTS)"
 
 msgid "IGN orthophoto San Juan (WMTS)"
-msgstr ""
+msgstr "Ortofoto de San Juan del IGN (WMTS)"
 
 msgid "IGN orthophoto San Luis (WMTS)"
-msgstr ""
+msgstr "Ortofoto de San Luis del IGN (WMTS)"
 
 msgid "IGN orthophoto Santa Cruz III (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Santa Cruz III del IGN (WMTS)"
 
 msgid "IGN orthophoto Santa Cruz IV (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Santa Cruz IV del IGN (WMTS)"
 
 msgid "IGN orthophoto Santa Cruz VI (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Santa Cruz VI del IGN (WMTS)"
 
 msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Santa Fe y Paraná del IGN (WMTS)"
 
 msgid "IGN orthophoto Tucumán (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Tucumán del IGN (WMTS)"
 
 msgid "IGN orthophoto Ushuaia (WMTS)"
-msgstr ""
+msgstr "Ortofoto de Ushuaia del IGN (WMTS)"
 
 msgid "Educational map (WMS)"
-msgstr ""
+msgstr "Mapa educativo de la Argentina (WMS)"
 
 msgid "Ministry of Agroindustry (WMS)"
-msgstr ""
+msgstr "Ministerio de Agroindustria, Argentina (WMS)"
 
 msgid "Ministry of Energy and Mining (WMS)"
-msgstr ""
+msgstr "Ministerio de Energía y Minería, Argentina (WMS)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
-msgstr ""
+msgid "imagico.de: Bahía Blanca (low tide)"
+msgstr "imagico.de: Bahía Blanca (marea baja)"
 
 msgid "Tidal flats and islands at the coast (true color)"
-msgstr ""
+msgstr "Llanuras mareales e islas en la costa (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
-msgstr ""
+msgid "imagico.de: Bahía Blanca (high tide)"
+msgstr "imagico.de: Bahía Blanca (marea alta)"
 
 msgid "AGRI black-and-white 2.5m"
 msgstr "AGRI blanco y negro 2.5m"
@@ -25798,7 +25901,7 @@ msgstr "Límites administrativos de Bosques Estatales de LPI NSW"
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "Límites administrativos de Reservas NPWS de LPI NSW"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: Northwest Heard Island"
 msgstr "Imágenes de imagico.de: Noroeste de la isla Heard"
 
 msgid ""
@@ -25807,7 +25910,7 @@ msgstr ""
 "Glaciares del Noroeste de la Isla Heard (que están siendo mapeados) (falso "
 "color IR)"
 
-msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgid "imagico.de: Heard Island coast"
 msgstr "Imágenes de imagico.de: Costa de la isla Heard"
 
 msgid ""
@@ -25829,6 +25932,8 @@ msgstr "basemap.at Orthofoto"
 msgid ""
 "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery."
 msgstr ""
+"Capa de ortofoto provista por basemap.at. \"Scuesor\" de las imágenes de "
+"geoimage,at."
 
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
@@ -25875,7 +25980,7 @@ msgstr "VoGIS: Flächenwidmungsplan"
 msgid "VoGIS: Höhen und Gelände"
 msgstr "VoGIS: Alturas y terrenos"
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr "Imágenes de imagico.de: Montañas Rila y Pirin"
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -25930,7 +26035,7 @@ msgid "URBIS 2016 aerial imagery"
 msgstr "Imágenes aéreas URBIS 2016"
 
 msgid "URBIS 2017 aerial imagery"
-msgstr ""
+msgstr "Imágenes aéreas de URBIS 2017"
 
 msgid "SPW(allonie) PICC numerical imagery"
 msgstr "Imágenes aéreas SPW(allonie) PICC numéricas"
@@ -25939,7 +26044,7 @@ msgid "SPW(allonie) most recent aerial imagery"
 msgstr "Imágenes aéreas más recientes de SPW(allonie)"
 
 msgid "SPW(allonie) 2016 aerial imagery"
-msgstr ""
+msgstr "Imágenes aéreas 2016 de SPW  (allonie)"
 
 msgid "SPW(allonie) 2015 aerial imagery"
 msgstr "SPW(slitario) 2015 imágenes aéreas"
@@ -25951,7 +26056,7 @@ msgid "SPW(allonie) 2009-2010 aerial imagery"
 msgstr "SPW(solitario) 2009-2010 imágenes aéreas"
 
 msgid "SPW(allonie) shaded relief"
-msgstr ""
+msgstr "Relieve sombreado de SPW(allonie)"
 
 msgid "TEC bus lines"
 msgstr "Líneas de autobús de TEC"
@@ -25962,7 +26067,7 @@ msgstr "Paradas de autobús de TEC"
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "Benín: Cotonou Pleiade 2016"
 
-msgid "imagico.de OSM images for mapping: Cotonou"
+msgid "imagico.de: Cotonou"
 msgstr "Imágenes de imagico.de: Cotonú"
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
@@ -25970,7 +26075,7 @@ msgstr ""
 "Cobertura irregular y parcialmente nubosa en orígenes usuales (color "
 "verdadero)"
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
 msgstr "Imágenes de imagico.de: Isla Bouvet"
 
 msgid "For more accurate coastline and glacier mapping (true color)"
@@ -25991,12 +26096,14 @@ msgid "Addresses data from IBGE"
 msgstr "Datos de direcciones de IBGE"
 
 msgid "Street names IBGE Salvador-BA"
-msgstr ""
+msgstr "Nombres de calles según el IBGE en Salvador, Bahía, Brasil"
 
 msgid ""
 "Streets geometry and names of Salvador, Bahia. Source: Faces de Logradouro - "
 "IBGE."
 msgstr ""
+"Nombres y geometría de las calles de Salvador, Bahía. Fuente: Faces de "
+"Logradouro - IBGE."
 
 msgid "Rio Mosaic 2013"
 msgstr "Mosaico de Río de Janeiro 2013"
@@ -26142,13 +26249,13 @@ msgstr "Imágenes aéreas de alta calidad tomadas para la ciudad de Kelowna"
 msgid "Kelowna Roads overlay"
 msgstr "Superposición de callejero de Kelowna"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
 msgstr "Imágenes de imagico.de: Costa este de la Isla Devon"
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr "Línea costera en proceso de mapeo (color falso IR)"
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: Northern Ellesmere Island"
 msgstr "Imágenes de imagico.de: Norte de la isla de Ellesmere"
 
 msgid ""
@@ -26157,8 +26264,7 @@ msgstr ""
 "Ensamblado de imágenes áereas ASTER de Julio 2012 (color verdadero con azul "
 "estimado)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+msgid "imagico.de: Northern Ellesmere Island July 2016"
 msgstr ""
 "Imágenes de imagico.de: Norte de la isla de Ellesmere en Julio de 2016"
 
@@ -26168,13 +26274,13 @@ msgstr ""
 "Ensamblado de imágenes aéreas julio 2016 ASTER (color verdadero con azul "
 "estimado)"
 
-msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgid "imagico.de: Fogo, Cape Verde"
 msgstr "Imágenes de imagico.de: Fogo, Cabo Verde"
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr "Imagen posterior a la erupción de 2014/2015 (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr "Imágenes de imagico.de: Isla Londonderry"
 
 msgid ""
@@ -26185,7 +26291,7 @@ msgstr ""
 "aquí. El mapeo de glaciares no es posible debido a la gran cantidad de "
 "nieve. Color falso IR"
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
 msgstr "Imágenes de imagico.de: Volcán Calbuco"
 
 msgid "Image from after the 2015 eruption (true color)"
@@ -26219,10 +26325,10 @@ msgid "SDFE DTK Kort25"
 msgstr "SDFE DTK Kort25"
 
 msgid "SDFE Terrain Shadow Map (40 cm)"
-msgstr ""
+msgstr "Mapa de terreno con sombras de SDFE (40 cm)"
 
 msgid "SDFE Surface Shadow Map (40 cm)"
-msgstr ""
+msgstr "Mapa de la superficie con sombras de SDFE (40 cm)"
 
 msgid "SDFE Skærmkort"
 msgstr "SDFE Skærmkort"
@@ -26233,7 +26339,7 @@ msgstr "Stevns"
 msgid "Vejmidte"
 msgstr "Vejmidte"
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr "Imágenes de imagico.de: El Altar"
 
 msgid ""
@@ -26243,7 +26349,7 @@ msgstr ""
 "Imágenes de ASTER 2007 que ofrecen una mejor cobertura de glaciares que la "
 "mayoría de las fuentes comunes (color verdadero con azul estimado)"
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr "Imágenes de imagico.de: Islas Darwin y Wolf, Galápagos"
 
 msgid ""
@@ -26268,10 +26374,11 @@ msgid "Estonia Forestry (Maaamet)"
 msgstr "Bosques de Estonia (Maaamet)"
 
 msgid "Nordic snowmobile overlay"
-msgstr ""
+msgstr "Superposición nórdica de vehículos de nieve"
 
 msgid "Kelkkareitit.fi snowmobile trails from OSM (Nordic coverage)"
 msgstr ""
+"Kelkkareitit.fi pistas de vehículos de nieve de OSM (cobertura nórdica)"
 
 msgid "BANO"
 msgstr "BANO"
@@ -26289,7 +26396,7 @@ msgid "Bordeaux - 2012"
 msgstr "Burdeos - 2012"
 
 msgid "Bordeaux - 2016"
-msgstr ""
+msgstr "Burdeos - 2016"
 
 msgid "Cadastre"
 msgstr "Catastro"
@@ -26298,7 +26405,7 @@ msgid "French land registry"
 msgstr "Registro de tierras francés"
 
 msgid "CRAIG - Auvergne 2016 - 25 cm"
-msgstr ""
+msgstr "CRAIG - Auvernia 2016 - 25 cm"
 
 msgid "CRAIG - Auvergne 2013 - 25 cm"
 msgstr "CRAIG - Auvergne 2013 - 25 cm"
@@ -26385,13 +26492,13 @@ msgid "Berlin aerial photograph 2016"
 msgstr "Berlín - Fotografías aéreas de 2016"
 
 msgid "Berlin aerial photograph 2017"
-msgstr ""
+msgstr "Fotografías aéreas de Berlín de 2017"
 
 msgid "Deutsche Bahn VzG lines Nov 2015"
 msgstr "Líneas de Deutsche Bahn VzG Noviembre 2015"
 
 msgid "Deutsche Bahn VzG lines January 2017"
-msgstr ""
+msgstr "Líneas de Deutsche Bahn VzG Enero 2017"
 
 msgid "Erlangen aerial imagery (2016 5.0 cm)"
 msgstr "Erlangen - Imágenes aéreas (2016 5.0 cm)"
@@ -26416,11 +26523,8 @@ msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr "Área metropolitana de Rurh: Luftbilder (10 cm)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
-msgstr ""
-"Imágenes OSM de imagico.de para mapeo: marismas del oeste de Alemania "
-"Septentrional"
+msgid "imagico.de: Northern German west coast tidalflats"
+msgstr "imagico.de: marismas del oeste de Alemania Septentrional"
 
 msgid ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
@@ -26429,12 +26533,8 @@ msgstr ""
 "Imágenes áreas de marea baja actualizadas para la actualización del mapeo de "
 "bancos de arena y marismas (color verdadero)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
-msgstr ""
-"Imágenes OSM de imagico.de para mapeo: marismas del oeste de Alemania Boreal "
-"(infrarrojo)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
+msgstr "imagico.de: marismas del oeste de Alemania Boreal (infrarrojo)"
 
 msgid ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
@@ -26443,11 +26543,11 @@ msgstr ""
 "Imágenes aéreas de marea baja actualizadas para un mapeo actualizado de "
 "marismas y bajos costeros"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr "Imágenes OSM de imagico.de para mapeo: costa del Mar del Norte 2016"
+msgid "imagico.de: North Sea Coast 2016"
+msgstr "imagico.de: costa del Mar del Norte 2016"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
-msgstr ""
+msgid "imagico.de: North Sea Coast 2017"
+msgstr "imagico.de: La costa del Mar del Norte 2017"
 
 msgid "Saxony latest aerial imagery"
 msgstr "Sajonia últimas imágenes aéreas"
@@ -26479,7 +26579,7 @@ msgstr "Mainz últimas imágenes aéreas"
 msgid "Munich latest aerial imagery 60cm"
 msgstr "Últimas imágenes aéreas de Múnich 60 cm"
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
 msgstr "Imágenes de imagico.de: Qasigiannguit"
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
@@ -26487,32 +26587,33 @@ msgstr ""
 "Imágenes de Icebridge DMS de los asentamientos - el alineamiento puede ser "
 "pobre"
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
 msgstr "Imágenes de imagico.de: Base aérea de Thule"
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr "Imágenes de Icebridge DMS - el alineamiento puede ser pobre"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
-msgstr ""
+msgid "imagico.de: Kangerlussuaq Autumn"
+msgstr "imagico.de: Kangerlussuaq. Otoño  2017"
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
+"Imágenes Icebridge DMS del aeropuerto y asentamientos - el alineamiento "
+"puede ser impreciso"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
-msgstr ""
+msgid "imagico.de: Kangerlussuaq Spring"
+msgstr "imagico.de: Kangerlussuaq. Primavera."
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
+"Imágenes Icebridge DMS del aeropuerto y caminos - el alineamiento puede ser "
+"impreciso"
 
-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 ""
-"Imágenes OSM de imagico.de para mapeo: vuelo a baja altura de la base aérea "
-"de Thule DMS septiembre 2015"
+"imagico.de: vuelo a baja altura de la base aérea de Thule DMS septiembre 2015"
 
 msgid ""
 "Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
@@ -26520,28 +26621,21 @@ msgstr ""
 "Imágenes de Icebridge DMS desde la base aérea de Thule - el alineamiento "
 "puede ser pobre"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
-"2015"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
 msgstr ""
-"Imágenes OSM de imagico.de para mapeo: vuelo bajo desde la base aérea de "
-"Thule DMS septiembre 2015"
+"imagico.de: vuelo bajo desde la base aérea de Thule DMS septiembre 2015"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
-msgstr ""
-"Imágenes OSM de imagico.de para mapeo: Base aérea de Thule DMS vuelo bajo "
-"octubre 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
+msgstr "imagico.de: Base aérea de Thule DMS vuelo bajo octubre 2015"
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
 msgstr "Imágenes de imagico.de: Mosaico de Groenlandia"
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr "Mosaico Landsat de Groenlandia (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
-msgstr ""
-"Imágenes OSM de imagico.de para mapeo:  Landsat respecto al nadir mayo 2013"
+msgid "imagico.de: May 2013 off-nadir Landsat"
+msgstr "imagico.de:  Landsat respecto al nadir mayo 2013"
 
 msgid ""
 "First available image north of the regular Landsat limit, mostly with "
@@ -26550,17 +26644,16 @@ msgstr ""
 "Primera imagen disponible al norte de los límites regulares de Landsat, "
 "mayormente con cobertura nívea lo que lo vuelve difícil de interpretaar"
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
-msgstr ""
-"Imágenes OSM de imagico.de para mapeo: Landsat respecto al nadir julio 2016"
+msgid "imagico.de: Landsat off-nadir July 2016"
+msgstr "imagico.de: Landsat respecto al nadir julio 2016"
 
 msgid "Latest images north of the regular Landsat limit (true color)"
 msgstr ""
 "Últimas imágenes al norte de los límites reulgares de Landsat (color "
 "verdadero)"
 
-msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
-msgstr "Imágenes OSM de imagico.de para mapeo: Norte de Groenlandia ASTER"
+msgid "imagico.de: Northern Greenland ASTER"
+msgstr "imagico.de: Norte de Groenlandia ASTER"
 
 msgid ""
 "Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
@@ -26629,13 +26722,13 @@ msgstr "OpenStreetMap Hungría (rutas de senderismo)"
 msgid "Hillshade Hungary"
 msgstr "Sombreado (hillshade) en Hungría"
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
 msgstr "Imágenes de imagico.de: Este de Islandia"
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr "Islotes faltantes y costa imprecisa (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
 msgstr "Imágenes de imagico.de: Rann de Kutch"
 
 msgid ""
@@ -26645,15 +26738,17 @@ msgstr ""
 "Difícil de distinguir apropiadamente entre tierra y agua basándose en las "
 "imágenes Bing/Mapbox (color falso infrarrojo)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
-msgstr ""
+msgid "imagico.de: Sudirman Range 2015"
+msgstr "imagico.de: Las montañas de Sudirman. 2015."
 
 msgid ""
 "Older image of the Sudirman Range with no fresh snow showing glacier extent "
 "(true color)"
 msgstr ""
+"Imágenes más antiguas de las montañas de Sudirman sin nieve fresca y "
+"mostrando la extensión de los glaciares (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr "Imágenes de imagico.de: Sureste de Célebes"
 
 msgid ""
@@ -26664,24 +26759,26 @@ msgstr ""
 "nubosa en Bing, los lagos pueden también utilizar detalles adicionales "
 "(color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
 msgstr "Imágenes de imagico.de: Represa de Bakun"
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr "Faltantes en imágenes anteriores a 2011 (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
 msgstr "Imágenes de imagico.de: Batam"
 
 msgid "Missing Islands in OSM (true color)"
 msgstr "Islas faltantes en OSM (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
-msgstr ""
+msgid "imagico.de: Sudirman Range 2016"
+msgstr "imagico.de: Las montañas de Sudirman. 2016."
 
 msgid ""
 "Cloud free image of the Sudirman Range but with fresh snow (true color)"
 msgstr ""
+"Imágenes sin nubes de las montañas de Sudirman pero con nieve fresca (color "
+"verdadero)"
 
 msgid "Ireland British War Office 1:25k GSGS 3906"
 msgstr "Oficina de Guerra de Irlanda del Norte 1:25k GSGS 3906"
@@ -26720,16 +26817,16 @@ msgid "OSMIE T.ie Land not in Counties"
 msgstr "OSMIE T.ie Tierra que no está en condados"
 
 msgid "Israel Hiking"
-msgstr ""
+msgstr "Senderismo de Israel"
 
 msgid "Israel Hiking map"
-msgstr ""
+msgstr "Mapa de senderismo de Israel"
 
 msgid "Israel MTB"
-msgstr ""
+msgstr "MTB Israel"
 
 msgid "Israel MTB map"
-msgstr ""
+msgstr "Mapa de mountain-bike para Israel"
 
 msgid "Lodi - Italy"
 msgstr "Lodi - Italia"
@@ -26769,7 +26866,7 @@ msgid "South Tyrol Orthofoto 2014"
 msgstr "Ortofoto de Tirol del Sur 2014"
 
 msgid "South Tyrol Orthofoto 2014/2015"
-msgstr ""
+msgstr "Ortofoto 2014/2015 de Tirol del Sur"
 
 msgid "South Tyrol Topomap"
 msgstr "Tirol Sur Topomapa"
@@ -26781,23 +26878,25 @@ msgid "Japan GSI ortho Imagery"
 msgstr "Imágenes aéreas de Japón GSI"
 
 msgid "Japan GSI Standard Map"
-msgstr ""
+msgstr "Mapa estándar del GSI de Japón"
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
-msgstr ""
+msgid "imagico.de: Aral Sea (low water level)"
+msgstr "imagico.de: Mar de Aral (nivel de agua bajo)"
 
 msgid "Water and wetland extents, dams etc. (true color)"
-msgstr ""
+msgstr "Extensiones de agua y humedales, represas, etc. (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
-msgstr ""
+msgid "imagico.de: Aral Sea (high water level)"
+msgstr "imagico.de: Mar de Aral (nivel de agua alto)"
 
 msgid ""
 "Water and wetland extents, dams etc. - some remaining winter ice in the "
 "north (true color)"
 msgstr ""
+"Extensiones de agua y humedales, represas, etc. - algunos con restos de "
+"hielo invernal en el norte (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
 msgstr "Imágenes de imagico.de: Monte Kenia 2016"
 
 msgid "Up-to-date image for glacier mapping (true color)"
@@ -26813,7 +26912,7 @@ msgid "20cm ortho - Latvia - Coastline"
 msgstr "20cm ortofoto - Línea costera de Letonia"
 
 msgid "Orthophoto 1st cycle (1994-1999) - Latvia"
-msgstr ""
+msgstr "Ortofoto primer ciclo (1994-1999) - Letonia"
 
 msgid "ORT10LT (Lithuania)"
 msgstr "ORT10LT (Lituania)"
@@ -26822,13 +26921,13 @@ msgid "geoportail.lu all layers"
 msgstr "todas las capas de geoportail.lu"
 
 msgid "geoportail.lu ortho latest"
-msgstr ""
+msgstr "Última ortofoto de geoportail.lu"
 
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr "Delta del Níger Oct 2012"
 
 msgid "INEGI Digital Map of Mexico (WMS)"
-msgstr ""
+msgstr "Mapa digital del INEGI de México (WMS)"
 
 msgid "PDOK aerial imagery Beeldmateriaal.nl 25cm"
 msgstr "Imágenes aéreas PDOK Beeldmateriaal.nl 25cm"
@@ -26850,165 +26949,240 @@ msgid "LINZ NZ Topo50 Gridless Maps"
 msgstr "Mapas sin grilla Topo50 de LINZ NZ"
 
 msgid "Kartverket N50 topo"
-msgstr ""
+msgstr "Kartverket (Organismo de catastro noruego) N50 topográfico"
 
 msgid "Topographic map N50, equivalent to Norway 1:50.000 paper map series."
 msgstr ""
+"Mapa topográfico N50, equivalente a la serie de mapas en papel de Noruega "
+"1:50.000"
 
 msgid "Kartverket Hillshade overlay"
-msgstr ""
+msgstr "Superposición de sombreado de Kartverket"
 
 msgid "Hillshade for Norway"
-msgstr ""
+msgstr "Sombreado de relieve para Noruega"
 
 msgid "Kartverket Nautical Charts"
-msgstr ""
+msgstr "Cartas náuticas de Kartverket"
 
 msgid ""
 "Norwegian nautical charts (includes Spitsbergen/Svalbard and Antarctica). "
 "Raster representation of paper charts. Updated biweekly."
-msgstr ""
+msgstr "Cartas náuticas noruegas (incluye Spitsbergen/Svalbard y Antártida)"
 
 msgid "Kartverket Road Network overlay"
-msgstr ""
+msgstr "Superposición de la red de caminos de \t Kartverket"
 
 msgid ""
 "Norwegian road network from the National Road database (NVDB), also used in "
 "Vbase and Elveg. Colours represent national, county, municipal, private and "
 "forest roads + footways/cycleways."
 msgstr ""
+"Red de caminos noruegos de la Base de Datos Nacional de Caminos (NVDB), "
+"también utilizada en Vbase y Elveg. Los colores representan caminos "
+"nacionales, de condado, municipales, privadas y de bosque + ciclovías y "
+"sendas."
 
 msgid "Kartverket Trails overlay"
-msgstr ""
+msgstr "Superposición de Pistas Kartverket."
 
 msgid ""
 "Trails from the Norwegian database of `Tur og Friluftsruter´. Selectable "
 "categories for foot, bike and ski trails."
 msgstr ""
+"Pistas de la base de datos noruega de `Tur og Friluftsruter´. Categorías "
+"seleccionables para pistas de caminata, ciclismo y esquí."
 
 msgid "Kartverket Place Names overlay"
-msgstr ""
+msgstr "Superposición de Toponimia de Kartverket"
 
 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 ""
+"Toponimia oficial noruega de la base de datos SSR. Categorías seleccionables."
 
 msgid "Kartverket DTM Digital Terrain Model"
-msgstr ""
+msgstr "Modelo de terreno digital DTM de Kartrverket"
 
 msgid ""
 "Shaded relief representation of open Norwegian Digital Terrain Model (DTM) "
 "projects, i.e. earth surface without trees, buildings and other objects. "
 "Please visit hoydedata.no to determine project year."
 msgstr ""
+"Representación de relieve sombreada de los proyectos abiertos del Modelo de "
+"Terreno Digital (DTM) noruego, es decir la superficie sin árboles, edificios "
+"ni otros objetos. Por favor visite hoydedata.no para determinar el año del "
+"proyecto."
 
 msgid "Kartverket DOM Digital Surface Model"
-msgstr ""
+msgstr "Modelo de superficie digital DOM de Kartverket"
 
 msgid ""
 "Shaded relief representation of open Norwegian Digital Surface Model (DOM) "
 "projects, i.e. earth surface including trees, buildings and other objects on "
 "top of it. Please visit hoydedata.no to determine project year."
 msgstr ""
+"Representación de relieve sombreada de los proyectos abiertos del Modelo de "
+"Superficie Digital (DTM) noruego, es decir la superficie con árboles, "
+"edificios y otros objetos sobre ella. Por favor visite hoydedata.no para "
+"determinar el año del proyecto."
 
 msgid "Kartverket Historic maps"
-msgstr ""
+msgstr "Mapas históricos de Kartverket"
 
 msgid "Historic maps - for the time being `Amtskartserien´ 1826-1917."
-msgstr ""
+msgstr "Mapas históricos - para el timpo de `Amtskartserien´ 1826-1917."
 
 msgid "Kartverket Economic Maps (historic)"
-msgstr ""
+msgstr "Mapas económicos de Kartverket (históricos)"
 
 msgid ""
 "1st edition of historic Economic maps for Norway 1960-90s (`Økonomisk "
 "kartverk´). Available from zoom 16. Please correct local imagery offset."
 msgstr ""
+"Primera edición de los mapas económicos de Noruega 1960-90s (`Økonomisk "
+"kartverk´). Disponible para el nivel de acercamiento 16. Por favor corrija "
+"el desplazamiento de las imágenes locales"
 
 msgid "Kartverket Administrative Boundaries overlay"
-msgstr ""
+msgstr "Superposición de los Límites Administrativos de Kartverket"
 
 msgid ""
 "Official administrative boundaries at the national, county and municipality "
 "levels"
 msgstr ""
+"Límites administrativos oficiales a nivel nacional, de condado y municipal"
 
 msgid "Kartverket Cadastral overlay"
-msgstr ""
+msgstr "Superposicíon del Catastro de Kartverket"
 
 msgid ""
 "Real estate boundaries from the official land register (`matrikkelen´). "
 "Monthly update."
 msgstr ""
+"Límites de parcelas del registro de tierras oficiales (`matrikkelen´). "
+"Actualización mensual."
 
 msgid "Kartverket Aviation Obstructions overlay"
-msgstr ""
+msgstr "Superposición de las Obstrucciones a la Aviación de Kartverket"
 
 msgid ""
 "Vertical obstructions to aircrafts, above 15m in rural areas and 30m in "
 "urban areas (e.g. masts, towers, high buildings, power lines)"
 msgstr ""
+"Obstrucciones verticales para la navegación aérea, por encima de los 15 "
+"metros en las áreas rurales y 30 metros en las urbanas ( por ejemplo "
+"mástiles, torres, edificios altos, líneas del tendido eléctrico)"
 
 msgid "NVE Electricity Network overlay"
-msgstr ""
+msgstr "Superposición de la Red de Electricidad NVE"
 
 msgid ""
 "Power lines (high voltage network) including transformers, submarine cables "
 "and pylons. Local distribution network is not included."
 msgstr ""
+"Líneas de media y alta tensión incluyendo transformadores cables submarinos "
+"y pilones. No se incluyen las redes de distribución locales."
 
 msgid "NVE Hydropower Plants overlay"
-msgstr ""
+msgstr "Superposición de las Plantas de Hidroenergía NVE"
 
 msgid ""
 "Hydropower plants including waterways (tunnel, canal, pipeline) and dams"
 msgstr ""
+"Plantas de hidroenergía incluyendo cursos de agua (túnel, canal, tuberías) y "
+"represas"
 
 msgid "NVE Wind Power Plants overlay"
-msgstr ""
+msgstr "Superposición de las Plantas de Energía Eólicas NVE"
 
 msgid ""
 "Wind power turbines, farms and concession areas. Red colour = concession "
 "denied."
 msgstr ""
+"Turbinas de energía eólicas, granjas y áreas concesionadas. Color rojo = "
+"concesión denegada."
 
 msgid "NPD Offshore Installations overlay"
-msgstr ""
+msgstr "Superposición de las Instalaciones Marítimas NPD"
 
 msgid ""
 "Production platforms and oil/natural gas fields on the Norwegian continental "
 "shelf"
 msgstr ""
+"Plataformas de producción y campos de petróleo/gas natural en la plataforma "
+"continental noruega"
+
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr "Superposición de la Asistencia Navigacional de la Kystverket"
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+"Faros, boyas, luces y pasos mantenidos por la Administración Costera Noruega"
 
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr ""
+"Superposición de las áreas protegidas de la Agencia Ambiental Noruega"
 
 msgid ""
 "Norwegian national parks, nature reserves and other protected areas and "
 "objects from Naturbase, including Svalbard/Spitsbergen"
 msgstr ""
+"Parques nacionales noruegas, reservas naturales y otros objetos y áreas "
+"protegidas  de la Naturbase, incluyendo Svalbard/Spitsbergen"
 
-msgid "NP Svalbard Orthophoto"
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr "Superposición de sitios históricos de Riksantikvaren"
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
 msgstr ""
+"Sitios, monumentos históricos y entornos culturales protegidos por ley "
+"(''enkeltminner'') de la Dirección Noruega de Patrimonio Cultural"
+
+msgid "SSB Urban Areas overlay"
+msgstr "Superposición de Áreas Urbanas de SSB"
 
 msgid ""
-"Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
 msgstr ""
+"Asentamientos humanos de al menos 200 personas con menos de 200 metros entre "
+"viviendas"
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
-msgstr "Imágenes OSM de imagico.de para mapeo: mosaico Svalbard"
+msgid "MTBmap.no"
+msgstr "MTBmap.no"
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+"Mapa de ciclismo de montaña noruego de OSM (nivel de acercamiento máximo 14-"
+"16, varía según la región)"
+
+msgid "NP Svalbard Orthophoto"
+msgstr "Ortofoto de NP Svalbard"
+
+msgid ""
+"Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
+msgstr "Ortofoto de Svalbard/Spitsbergen para el Instituto Polar Noruego"
+
+msgid "imagico.de: Svalbard mosaic"
+msgstr "imagico.de: mosaico Svalbard"
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr "Mosaico Sentinel-2 de Svalbard (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
 msgstr "Imágenes de imagico.de: Karakoram occidental"
 
 msgid ""
@@ -27024,7 +27198,7 @@ msgstr "Franja de Gaza - Pléyades - 2014/07/06"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Franja de Gaza - Pléyades - 2014/07/06 (NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr "Imágenes de imagico.de: Canal de Panamá - lado del Pacífico"
 
 msgid ""
@@ -27034,14 +27208,14 @@ msgstr ""
 "Nuevos bloqueos con menos nubles que en la imagen Sentinel-2 - asgúrese de "
 "verificar el alineamiento de la imagen (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
 msgstr "Imágenes de imagico.de: Canal de Panamá"
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 "Imágenes de los nuevos bloqueos (pero parcialmente nublado), color verdadero"
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
 msgstr "Imágenes de imagico.de: Vanatinai"
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
@@ -27049,7 +27223,7 @@ msgstr ""
 "Línea de costa con poco detalle debido a la cobertura nubosa en Bing/Mapbox "
 "(color verdadero)"
 
-msgid "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
 msgstr "Imágenes de imagico.de: Nueva Irlanda"
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
@@ -27057,11 +27231,10 @@ msgstr ""
 "Muchas islas faltantes en OSM (la mayoría de las cuales están siendo "
 "mapeadas), color verdadero"
 
-msgid "imagico.de OSM images for mapping: Coropuna"
+msgid "imagico.de: Coropuna"
 msgstr "Imágenes de imagico.de: Coropuna"
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
 msgstr "Imágenes de imagico.de: Cordillera de Vilcanota y glaciar Quelccaya"
 
 msgid "Poor and outdated imagery in other sources (true color)"
@@ -27071,10 +27244,10 @@ msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr "Pangasinán/Bulacan (alta resolución Filipinas)"
 
 msgid "Geoportal 2: Orthophotomap (aerial image)"
-msgstr ""
+msgstr "Geoportal 2: Ortofotomapa (imagen aérea)"
 
 msgid "Geoportal 2: Orthophotomap (aerial image) WMTS"
-msgstr ""
+msgstr "Geoportal 2: Ortofotomapa (imagen aérea) WMTS"
 
 msgid "Geoportal 2: PRNG (geo names)"
 msgstr "Geoportal 2: PRNG (geo nombres)"
@@ -27083,127 +27256,136 @@ msgid "Geoportal 2: ISOK hillshade"
 msgstr "Geoportal 2: Mapa de sombras ISOK"
 
 msgid "polska.e-mapa.net: Buildings"
-msgstr ""
+msgstr "polska.e-mapa.net: Edificios"
 
 msgid "Będzin: Orthophotomap 2013 (aerial image)"
-msgstr ""
+msgstr "Będzin: Ortofotomapa 2013 (imagen aérea)"
 
 msgid "Będzin: Buildings"
-msgstr ""
+msgstr "Będzin: Edificios"
 
 msgid "Bytom: Orthophotomap 2012 (aerial image)"
-msgstr ""
+msgstr "Bytom: Ortofotomapa 2012 (imagen aérea)"
 
 msgid "Bytom: Fotoplan 2014 (aerial image)"
 msgstr "Bytom: Fotoplan 2014 (imagen aérea)"
 
 msgid "Bytom: Buildings"
-msgstr ""
+msgstr "Bytom: Edificios"
 
 msgid "Chorzów: Buildings"
-msgstr ""
+msgstr "Chorzów: Edificios"
 
 msgid "Częstochowa: Buildings"
-msgstr ""
+msgstr "Częstochowa: Edificios"
 
 msgid "Częstochowa: Orthophotomap 2011 (aerial image)"
-msgstr ""
+msgstr "Częstochowa: Ortofotomapa 2011 (imagen aérea)"
 
 msgid "Częstochowa: Orthophotomap 2013 (aerial image)"
-msgstr ""
+msgstr "Częstochowa: Ortofotomapa 2013 (imagen aérea)"
 
 msgid "Częstochowa: Orthophotomap 2014 (aerial image)"
-msgstr ""
+msgstr "Częstochowa: Ortofotomapa 2014 (imagen aérea)"
 
 msgid "Gliwice: Orthophotomap 2013 (aerial image)"
-msgstr ""
+msgstr "Gliwice: Ortofotomapa 2013 (imagen aérea)"
 
 msgid "Gliwice: Buildings"
-msgstr ""
+msgstr "Gliwice: Edificios"
 
 msgid "Katowice: Orthophotomap (aerial image)"
-msgstr ""
+msgstr "Katowice: Ortofotomapa (imagen aérea)"
 
 msgid "Katowice: Buildings"
-msgstr ""
+msgstr "Katowice: Edificios"
 
 msgid "Łódź: Buildings"
-msgstr ""
+msgstr "Łódź: Buildings"
 
-msgid "Łódź: Orthophotomap (aerial image)"
-msgstr ""
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr "Łódź: ortofotomapa 2015 (imagen aérea)"
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
+msgstr "Łódź: ortofotomapa 2017 (imagen aérea)"
 
 msgid "Powiat dębicki: Buildings"
-msgstr ""
+msgstr "Distrito de Dębica: Edificios"
 
 msgid "Powiat lubaczowski: Buildings"
-msgstr ""
+msgstr "Distrito de lubaczowski: edificios"
 
 msgid "Powiat łańcucki: Buildings"
-msgstr ""
+msgstr "Distrito de łańcucki: Edificios"
 
 msgid "Powiat poznański: Buildings"
-msgstr ""
+msgstr "Distrito de Poznański: Edificios"
 
 msgid "Powiat poznański: Orthophotomap (aerial image)"
-msgstr ""
+msgstr "Distrito de Poznański: ortofotomapa (imagen aérea)"
 
 msgid "Powiat ropczycko-sędziszowski: Buildings"
-msgstr ""
+msgstr "Distrito de ropczycko-sędziszowski: Edificios"
 
 msgid "Powiat rzeszowski: Buildings"
-msgstr ""
+msgstr "Distrito de Rzeszowski: Edificios"
 
 msgid "Powiat rzeszowski: Orthophotomap (aerial image)"
-msgstr ""
+msgstr "Distrito de Rzeszowski: ortofotomapa (imagen aérea)"
 
 msgid "Powiat stalowowolski: Buildings"
-msgstr ""
+msgstr "Distrito de Stalowowolski: edificios"
 
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
-msgstr ""
+msgstr "Posnania: ortofotomapa 2014 (imagen aérea)"
+
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr "Posnania: ortofotomapa 2016 (imagen aérea)"
+
+msgid "Poznań: Buildings"
+msgstr "Posnania: edificios"
 
 msgid "Przemyśl: Buildings"
-msgstr ""
+msgstr "Przemyśl: edificios"
 
 msgid "Przemyśl: Ortophotomap (aerial image)"
-msgstr ""
+msgstr "Przemyśl: ortofotomapa (imagen aérea)"
 
 msgid "Ruda Śląska: Orthophotomap (aerial image)"
-msgstr ""
+msgstr "Ruda Śląska: ortofotomapa (imagen aérea)"
 
 msgid "Rzeszów: Orthophotomap (aerial image)"
-msgstr ""
+msgstr "Rzeszów: ortofotomapa (imagen aérea)"
 
 msgid "Rzeszów: Buildings"
-msgstr ""
+msgstr "Rzeszów: Edificios"
 
 msgid "Siemianowice Śląskie: Orthophotomap (aerial image)"
-msgstr ""
+msgstr "Siemianowice Śląskie: ortofotomapa (imagen aérea)"
 
 msgid "Siemianowice Śląskie: Buildings"
-msgstr ""
+msgstr "Siemianowice Śląskie: edificios"
 
 msgid "Świętochłowice: Orthophotomap 2008 (aerial image)"
-msgstr ""
+msgstr "Świętochłowice: ortofotomapa (imagen aérea)"
 
 msgid "Świętochłowice: Orthophotomap 2009 (aerial image)"
-msgstr ""
+msgstr "Świętochłowice: ortofotomapa 2009 (imagen aérea)"
 
 msgid "Świętochłowice: Orthophotomap 2012 (aerial image)"
-msgstr ""
+msgstr "Świętochłowice: ortofotomapa 2012 (imagen aérea)"
 
 msgid "Zabrze: Orthophotomap 2011 (aerial image)"
-msgstr ""
+msgstr "Zabrze: ortofotomapa 2011 (imagen aérea)"
 
 msgid "Wrocław: Orthophotomap 2015 (aerial image)"
-msgstr ""
+msgstr "Breslavia: ortofotomapa 2015 (imagen aérea)"
 
 msgid "Ortofotos DGRF 2004-2006 (WMS)"
-msgstr ""
+msgstr "Ortofotos DGRF 2004-2006 (WMS)"
 
 msgid "Ortofotos Litoral DGT 2014-2015 (WMS)"
-msgstr ""
+msgstr "Ortofotos Litoral DGT 2014-2015 (WMS)"
 
 msgid "ScanEx IRS"
 msgstr "ScanEx IRS"
@@ -27211,40 +27393,36 @@ msgstr "ScanEx IRS"
 msgid "ScanEx SPOT"
 msgstr "ScanEx SPOT"
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
 msgstr "Imágenes de imagico.de: Estrecho de Kerch"
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 "Estado de construcción del puente en agosto de 2016 (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr "Imágenes OSM de imagico.de para mapeo: costa marina de Pechora"
+msgid "imagico.de: Pechora Sea Coast"
+msgstr "imagico.de: costa marina de Pechora"
 
 msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
 msgstr ""
 "Imagen Sentinel-2 de la costa marina de Pechora en otoño de 2016 (color "
 "verdadero)"
 
-msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
+msgid "imagico.de: Ushakov Island August 2016"
 msgstr "Imágenes de imagico.de: Isla de Ushakov en Agosto de 2016"
 
 msgid "Up-to-date late summer imagery with few clouds (true color)"
 msgstr ""
 "Imágenes actualizadas del último verano con pocas nubes (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Northern Dvina delta at low tide"
-msgstr ""
+msgid "imagico.de: Northern Dvina delta at low tide"
+msgstr "imagico.de: Delta de Dviná del Norte en marea baja"
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
-msgstr ""
+msgstr "Playas, llanuras mareales y otras formas costeras (color verddadero)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
-msgstr ""
-"Imágenes OSM de imagico.de para mapeo: montañas Urales boreales y polares, "
-"agosto 2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
+msgstr "imagico.de: montañas Urales boreales y polares, agosto 2016"
 
 msgid ""
 "Up-to-date late summer imagery with few clouds - caution: not all visible "
@@ -27253,7 +27431,7 @@ msgstr ""
 "Imágenes actualizadas del último verano con pocas nubes. Atención: no toda "
 "la nieve visible son glaciares (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
 msgstr "Imágenes de imagico.de: Cosmódromo Vostochni"
 
 msgid "Recent image showing newest features (true color)"
@@ -27304,26 +27482,26 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "Sudáfrica CD:NGI Aérea"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
-msgstr "Imágenes OSM de imagico.de para mapeo: ASTER - Isla de Leskov"
+msgid "imagico.de: Leskov Island ASTER"
+msgstr "imagico.de: ASTER - Isla de Leskov"
 
 msgid "Missing in other image sources (true color with estimated blue)"
 msgstr ""
 "Faltantes en otras fuentes de imágenes (color verdadero con azul estimado)"
 
-msgid "imagico.de OSM images for mapping: Scott Island"
+msgid "imagico.de: Scott Island"
 msgstr "Imágenes de imagico.de: Isla Scott"
 
 msgid "Missing in other image sources (true color)"
 msgstr "Faltantes en otras fuentes de imágenes (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
-msgstr "Imágenes OSM de imagico.de para mapeo: Landsat - Isla de Leskov"
+msgid "imagico.de: Leskov Island Landsat"
+msgstr "imagico.de: Landsat - Isla de Leskov"
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
 msgstr "Imágenes de imagico.de: Rocas Clerke"
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
 msgstr "Imágenes de imagico.de: Islas Aurora"
 
 msgid "Catastro Spain"
@@ -27347,7 +27525,7 @@ msgstr "IDEIB - Islas Baleares"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Expresa - Islas Canarias"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr "Imágenes de imagico.de: Puente Adams"
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -27355,16 +27533,16 @@ msgstr ""
 "Suplementando cobertura incompleta en otras fuentes (color verdadero)"
 
 msgid "Economic Maps (historic)"
-msgstr ""
+msgstr "Mapas económicos (histórico)"
 
 msgid "Scan of ´Economic maps´ ca 1950-1980"
-msgstr ""
+msgstr "Escaneo de ''Mapas económicos'' alrededor de 1950-1980"
 
 msgid "Snowmobile map Sweden"
-msgstr ""
+msgstr "Mapa de vehículos de nieve Suecia"
 
 msgid "Snowmobile trails"
-msgstr ""
+msgstr "Pistas de vehículos de nieve"
 
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr "Cantón Aargau 25cm (AGIS 2011)"
@@ -27439,14 +27617,13 @@ msgid "Kanton Basel-Stadt 2015"
 msgstr "Cantón de la Ciudad de Basilea 2015"
 
 msgid "Kanton Basel-Stadt 2017"
-msgstr ""
+msgstr "Cantón de Basilea Ciudad 2017"
 
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr "Cantón de Basilea Campiña 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 ""
-"Imágenes de imagico.de: Alpes centrales a finales de septiembre de 2016"
 
 msgid ""
 "Up-to-date image for glacier mapping - beware of some fresh snow at higher "
@@ -27455,6 +27632,13 @@ msgstr ""
 "Imágenes actualizadas para el mapeo de glaciares - tener cuidado con algo de "
 "nieve fresca en las elevaciones más altas (color verdadero)"
 
+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 "Datos abiertos Taiwan e-Map"
 
@@ -27475,11 +27659,11 @@ msgstr "Datos del Departamento de Tierras de Taiwán"
 msgid "NLSC Open Data WMTS"
 msgstr "NLSC Open Data WMTS"
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr "Imágenes de imagico.de: Monte Kilimanjaro 2016"
 
 msgid "Aşgabat (high resolution)"
-msgstr ""
+msgstr "Asjabad (alta resolución)"
 
 msgid "MSR Maps Topo"
 msgstr "MSR Mapas Topográficos"
@@ -27494,10 +27678,10 @@ msgid "USGS Large Scale Imagery"
 msgstr "Imágenes aéreas grandes USGS"
 
 msgid "TIGER Roads 2012"
-msgstr ""
+msgstr "Caminos de Tiger 2012"
 
 msgid "TIGER Roads 2014"
-msgstr ""
+msgstr "Caminos de TIGER 2014"
 
 msgid ""
 "At zoom level 16+, public domain map data from the US Census. At lower "
@@ -27509,12 +27693,14 @@ msgstr ""
 "los que ya fueron incorporados a OpenStreetMap"
 
 msgid "TIGER Roads 2017"
-msgstr ""
+msgstr "Caminos de TIGER 2017"
 
 msgid ""
 "Yellow = Public domain map data from the US Census. Red = Data not found in "
 "OpenStreetMap"
 msgstr ""
+"Amarillo = mapas del dominio público extraídos del Censo de Estados Unidos. "
+"Rojo = datos no encontrados en OpenStreetMap"
 
 msgid "MassGIS L3 Parcels"
 msgstr "MassGIS L3 Parcelas"
@@ -27546,7 +27732,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "Callejero del servicio de Bosques de EEUU"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr "Imágenes de imagico.de: Cordillera de Alaska"
 
 msgid ""
@@ -27556,17 +27742,18 @@ msgstr ""
 "Imágenes de verano recientes de la cordillera de Alaska para el mapeo de "
 "características naturales (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
-msgstr ""
+msgid "imagico.de: Bogoslof Island"
+msgstr "imagico.de: La isla de Bogoslof"
 
 msgid "Recent image from after the eruption (true color)"
-msgstr ""
+msgstr "Imagen reciente tras la erupción (color verdadero)"
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
-msgstr ""
+msgid "imagico.de: Cook Inlet"
+msgstr "imagico.de: La ensenada de Cook"
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
 msgstr ""
+"Llanuras mareales y glaciares en las montañas que la rodean (color verdadero)"
 
 msgid "NJ 2015 Aerial Imagery (Infrared)"
 msgstr "Imágenes aéreas NJ 2015 (infrarrojo)"
@@ -27589,7 +27776,7 @@ msgid "San Juan Metro Area: 2013 USACE Orthophotos"
 msgstr "Área Metropolitana de San Juan: Ortofotos USACE de 2013"
 
 msgid "PR/USVI 2017 NOAA Hurricane Maria imagery"
-msgstr ""
+msgstr "Imágenes aéreas del huracán María PR/USVI 2017 NOAA"
 
 msgid "WA 2013 aerial imagery for San Juan County"
 msgstr "Imágenes aéreas WA 2013 del Condado de San Juan"
@@ -27665,7 +27852,16 @@ msgstr ""
 "resolución, 4 bandas de color verdadero e infrarrojo cercano (R, G, B e IR) "
 "que cubren los Condados de New Castle, Kent y Sussex Counties en Delaware."
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr "Ortofotos del Estado de Nueva York en línea"
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+"Ortoimágenes digitales de alta resolución del Estado de Nueva York, "
+"resolución de 30 cm"
+
+msgid "imagico.de: Rwenzori Mountains"
 msgstr "Imágenes de imagico.de: Montañas Rwenzori"
 
 msgid ""
@@ -27675,7 +27871,7 @@ msgstr ""
 "Imágenes recientes de los remanentes de glacires en las Montañas Rwenzori "
 "(color falso infrarrojo)"
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr "Imágenes de imagico.de: Montañas Rwenzori 2016"
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -27690,6 +27886,12 @@ msgstr "Ucrania - Kiev 2014 (DZK)"
 msgid "7th Series (OS7)"
 msgstr "Séptima Serie (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr "OS Nueva Edición Popular histórica"
 
@@ -28718,7 +28920,7 @@ msgid "{0} on a node. Should be used on a way."
 msgstr "{0} sobre un nodo. Debería ser utilizado sobre una vía."
 
 msgid "{0} on a node. Should be used on a way or relation."
-msgstr ""
+msgstr "{0} en un nodo. Debería ser utilizado en una vía o relación."
 
 msgid "{0} on a node. Should be drawn as an area."
 msgstr "{0} sobre un nodo. Debería ser dibujado como un área."
@@ -28739,6 +28941,8 @@ msgid ""
 "Object at Position 0.00E 0.00N. There is nothing at this position except an "
 "already mapped weather buoy."
 msgstr ""
+"Objecto en la posición 0.00E 0.00N. No hay nada en esta ubicación excepto "
+"una boya climática."
 
 msgid "{0} together with {1} on a node. Remove {0}."
 msgstr "{0} junto con {1} en un nodo. Eliminar {0}."
@@ -28813,10 +29017,11 @@ msgstr ""
 "utilice {1} + {2}."
 
 msgid "Ferry route is not connected to the road network or branches."
-msgstr ""
+msgstr "La ruta de ferry no está conectada a la red de caminos o ramales."
 
 msgid "Ferry route is not connected to a ferry terminal or branches."
 msgstr ""
+"La ruta de ferry no está conectada a una terminal de ferry o ramales."
 
 msgid "abbreviated street name"
 msgstr "nombre de calle abreviado"
@@ -28867,58 +29072,54 @@ msgid "numerical key"
 msgstr "tecla numérica"
 
 msgid "{0} value with + sign"
-msgstr ""
+msgstr "Valor {0} con signo +"
 
 msgid "{0} should be an integer value between -5 and 5"
-msgstr ""
+msgstr "{0} debería ser un valor entero entre -5 y 5"
 
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr "{0} debe tener solamente números con incrementos opcionales de 0,5"
 
+msgid "unusual value of {0}: use . instead of , as decimal separator"
+msgstr "valor inusual de {0}: utilice . en lugar de , como separador decimal"
+
 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 es el valor por omisión; el punto es el separador; para otras "
-"unidades, introduzca un espacio y luego la unidad"
+"valor inusual de {0}: la unidad por defecto es metros; el separador decimal "
+"es el punto; si está ingresando la unidad introduzca un espacio entre el "
+"número y la unidad"
 
 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}: tonelada es la unidad por defecto; el separador es el punto y coma; si "
-"ingresa la unidad, introduzca un espacio y luego la unidad"
+"valor inusual de {0}: la unidad por defecto es tonelada; el separador "
+"decimal es el punto; si está ingresando la unidad introduzca un espacio "
+"entre el número y la unidad"
 
-msgid "unusual {0} format"
-msgstr "formato {0} inusual"
+msgid "unusual value of {0}"
+msgstr "valor poco común de {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}: kilómetros es la unidad por defecto; el separador es el punto y coma; "
-"si ingresa la unidad, introduzca un espacio y luego la unidad"
+"valor inusual de {0}: la unidad por defecto es kilómetro; el separador "
+"decimal es el punto; si está ingresando la unidad introduzca un espacio "
+"entre el número y la unidad"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 "el voltaje debería ser en voltios sin unidades/delimitadores/espacios"
 
-msgid "unusual {0} specification"
-msgstr "especificación {0} inusual"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "ancho de vía de tren inusual, usar mm sin separación"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr "inclinación inusual; usar porcentajes/grados o arriba/abajo"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} debe ser un valor numérico"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} debe ser un número entero positivo"
 
-msgid "unusual value of {0}"
-msgstr "valor poco común de {0}"
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr "{0} debe ser un valor numérico, en metros y sin unidades"
 
@@ -28929,7 +29130,7 @@ msgid "{0} relation without {0} tag"
 msgstr "relación {0} sin etiqueta {0}"
 
 msgid "way with {0} is part of a bicycle route relation"
-msgstr ""
+msgstr "la vía con {0} es parte de una relación de ruta de ciclismo"
 
 msgid "religion without denomination"
 msgstr "religion sin denomination"
@@ -28965,7 +29166,7 @@ msgid "Nodes duplicating parent way tags"
 msgstr "Nodos que duplican las etiquetas de las vías padre"
 
 msgid "{0} together with {1} and {2}. Remove {0}."
-msgstr ""
+msgstr "{0} junto con {1} y {2}. Elimine {0}."
 
 msgid ""
 "wikipedia tag has no language given, use ''wikipedia''=''language:page "
@@ -29043,6 +29244,9 @@ msgstr "Esconder íconos a un nivel bajo de acercamiento"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Símbolos de nodos más despejados a un nivel bajo de acercamiento"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr "Ocultar los nodos sin etiquetar en niveles de acercamiento bajos"
+
 msgid "Display street labels (at high zoom)"
 msgstr "Mostrar etiquetas de calles (en niveles altos de acercamiento)"
 
@@ -29104,6 +29308,9 @@ msgstr ""
 "Asigna automáticamente las direcciones a un objeto seleccionado en Austria. "
 "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."
@@ -29153,6 +29360,9 @@ msgstr ""
 "Implementa una línea de comandos y permite crear tus comandos. Vea el enlace "
 "para los comandos estándar (arco, círculo, etc)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr "Herramienta para combinar datos (emparejamiento y fusión)"
 
@@ -29210,6 +29420,13 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Gestión de EPCIs franceses (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+"Provee un colectivo de eventos más poderoso que la registración de puertos "
+"de escucha tradicionales"
+
 msgid "Use external scripts in JOSM"
 msgstr "Utilizar scripts externos en JOSM"
 
@@ -29441,6 +29658,9 @@ msgstr ""
 "Permite abrir archivos gpx/osm que intersectan con el área visible en la "
 "pantalla."
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -29947,19 +30167,19 @@ msgid "Importing..."
 msgstr "Importando..."
 
 msgid "Shape is started incorrectly"
-msgstr ""
+msgstr "La figura se inició de forma incorrecta"
 
 msgid "Can''t load SVG diagram"
-msgstr ""
+msgstr "No se puede cargar el diagrama SVG"
 
 msgid "Can''t find root SVG element"
-msgstr ""
+msgstr "No se puede encontrar el elemento raíz de SVG"
 
 msgid "Import primitives"
-msgstr ""
+msgstr "Primitivas de importación"
 
 msgid "Cannot find configuration file!"
-msgstr ""
+msgstr "¡No se puede encontrar el archivo de configuración!"
 
 msgid "DXF files [ImportDxf plugin] (*.dxf)"
 msgstr "Archivos DXF [componente ImportDxf] (* .dxf)"
@@ -30335,580 +30555,6 @@ msgstr "Importar imagen georreferenciada"
 msgid "Error while creating image layer: "
 msgstr "Error mientras se creaba la capa imagen: "
 
-msgid "Mapillary Images"
-msgstr "Imágenes de Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Capa de Mapillary"
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr "{0} secuencias, cada una contiene entre {1} y {2} imágenes (ø {3})"
-
-msgid "{0} imported images"
-msgstr "{0} imágenes importadas"
-
-msgid "{0} downloaded images"
-msgstr "{0} imágenes descargadas"
-
-msgid "{0} images in total"
-msgstr "{0} imágenes en total"
-
-msgid "{0} images in {1} sequences"
-msgstr "{0} imágenes en {1} secuencias"
-
-msgid "Mapillary object layer"
-msgstr "Capa de objeto Mapillary"
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-"Muestra la capa donde se visualiza los objetos de mapa detectados por "
-"Mapillary"
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Download Mapillary images in current view"
-msgstr "Descargar imágenes de Mapillary en la vista actual"
-
-msgid "Export pictures"
-msgstr "Exportar imágenes"
-
-msgid "Export Mapillary pictures"
-msgstr "Exportar imágenes de Mapillary"
-
-msgid "Export images"
-msgstr "Exportar imágenes"
-
-msgid "Import pictures"
-msgstr "Importar imágenes"
-
-msgid "Import local pictures"
-msgstr "Importar imágenes locales"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Importar imágenes a la capa de Mapillary"
-
-msgid "Join mode"
-msgstr "Modo unión"
-
-msgid "Join/unjoin pictures"
-msgstr "Unir/separar imágenes"
-
-msgid "Submit changeset"
-msgstr "Enviar conjunto de cambios"
-
-msgid "Submit the current changeset"
-msgstr "Enviar el conjunto de cambios actual"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "Enviar el conjunto de cambios actual a Mapillary"
-
-msgid "rejected"
-msgstr "rechazado"
-
-msgid "pending"
-msgstr "pendiente"
-
-msgid "approved"
-msgstr "aprobado"
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-"se enviaron {0} imágenes, clave del conjunto de cambios: {1}, estado: {2}"
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr "¡El conjunto de cambios  subido falló con {0} errores ''{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 ""
-"Se produjo una excepción al intentar enviar un conjunto de cambios. Si esto "
-"ocurre repetidamente, considerar reportar un error a través mediante el menú "
-"Ayuda. Si este mensaje aparece por primera vez, simplemente inténtelo de "
-"nuevo. Esto podría haber sido un problema con la conexión de Internet."
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr "Modo caminar"
-
-msgid "Zoom to selected image"
-msgstr "Zoom dentro de la imagen seleccionada"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Acercar a la imagen seleccionada de Mapillary"
-
-msgid "Current Mapillary changeset"
-msgstr "Conjunto de cambios de Mapillary actual"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Abrir el conjunto de cambios de Mapillary actual"
-
-msgid "Mapillary changeset"
-msgstr "Conjunto de cambios de Mapillary"
-
-msgid "Submitting changeset to server…"
-msgstr "Enviando conjunto de cambios al servidor..."
-
-msgid "Export all images"
-msgstr "Exportar todas las imágenes"
-
-msgid "Export selected sequence"
-msgstr "Exportar la secuencia seleccionada"
-
-msgid "Export selected images"
-msgstr "Exportar las imágenes seleccionadas"
-
-msgid "Rewrite imported images"
-msgstr "Reescribir las imágenes importadas"
-
-msgid "Select a directory"
-msgstr "Seleccionar un directorio"
-
-msgid "Explore"
-msgstr "Explorar"
-
-msgid "Speed limit"
-msgstr "Límite de velocidad"
-
-msgid "Give way"
-msgstr "Ceda el paso"
-
-msgid "No entry"
-msgstr "Ninguna entrada"
-
-msgid "Intersection danger"
-msgstr "Peligro por intersección"
-
-msgid "Mandatory direction (any)"
-msgstr "Dirección obligatoria (cualquiera)"
-
-msgid "Uneven road"
-msgstr "Camino irregular"
-
-msgid "No parking"
-msgstr "No estacionarse"
-
-msgid "No overtaking"
-msgstr "No rebasar"
-
-msgid "Pedestrian crossing"
-msgstr "Cruce de peatones"
-
-msgid "No turn"
-msgstr "No gire"
-
-msgid "Years"
-msgstr "Años"
-
-msgid "Months"
-msgstr "Meses"
-
-msgid "Days"
-msgstr "Días"
-
-msgid "Imported images"
-msgstr "Imágenes importadas"
-
-msgid "Mapillary filter"
-msgstr "Filtro de Mapillary"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Abrir diálogo del filtro de Mapillary"
-
-msgid "Not older than: "
-msgstr "No más antiguas que: "
-
-msgid "Downloaded images"
-msgstr "Imágenes descargadas"
-
-msgid "Only images with signs"
-msgstr "Solo imágenes con señales"
-
-msgid "Choose signs"
-msgstr "Elegir señales"
-
-msgid "Mapillary history"
-msgstr "Historial de Mapillary"
-
-msgid "Open Mapillary history dialog"
-msgstr "Abrir el diálogo del historial de Mapillary"
-
-msgid "No image selected"
-msgstr "Ninguna imagen seleccionada"
-
-msgid "Press \"{0}\" to download images"
-msgstr "Oprima \"{0}\" para descargar imágenes"
-
-msgid "Mapillary picture"
-msgstr "Imágenes de Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Abrir ventana de Mapillary"
-
-msgid "Next picture"
-msgstr "Fotografía siguiente"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Mostrar la imagen siguiente de la secuencia"
-
-msgid "Previous picture"
-msgstr "Fotografía anterior"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Mostrar la imagen previa de la secuencia"
-
-msgid "Jump to red"
-msgstr "Saltar al rojo"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Saltar a la imagen al otro lado de la línea roja"
-
-msgid "Jump to blue"
-msgstr "Saltar al azul"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Saltar a la imagen al otro lado de la línea azul"
-
-msgid "Stops the walk."
-msgstr "Detiene la caminata."
-
-msgid "Play"
-msgstr "Iniciar"
-
-msgid "Continues with the paused walk."
-msgstr "Continúa con la caminata pausada."
-
-msgid "Pause"
-msgstr "Pausar"
-
-msgid "Pauses the walk."
-msgstr "Pausar la caminata."
-
-msgid "Display hour when the picture was taken"
-msgstr "Mostrar la hora de cuando la fotografía fue tomada."
-
-msgid "Use 24 hour format"
-msgstr "Usar formato de 24 horas."
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-"Desplazarse a la ubicación de las imágenes con los botones "
-"siguiente/anterior."
-
-msgid "Preview images when hovering its icon"
-msgstr "Vista previa de imágenes cuando el cursor se sitúa sobre el icono"
-
-msgid "Cut off sequences at download bounds"
-msgstr "Corta las secuencias en los límites de descargas"
-
-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 ""
-"Permitir características beta experimentales (podría comportarse de forma "
-"inestable)"
-
-msgid "Download mode"
-msgstr "Modo de descarga"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr "Está registrado como ''{0}''."
-
-msgid "You are currently not logged in."
-msgstr "Actualmente no se encuentra registrado"
-
-msgid "Login"
-msgstr "Acceder"
-
-msgid "Logout"
-msgstr "Cerrar sesión"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-"Ir a las preferencias y acceder a Mapillary antes de comenzar con la subida."
-
-msgid "Upload selected sequence"
-msgstr "Subir secuencia seleccionada"
-
-msgid "Delete after upload"
-msgstr "Eliminar después de subir"
-
-msgid "Wait for full quality pictures"
-msgstr "Esperar por imágenes de máxima calidad"
-
-msgid "Follow selected image"
-msgstr "Seguir la imágen seleccionada"
-
-msgid "Go forward"
-msgstr "Avanzar"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr "¿Qué capas de imágenes desea importar a la capa de Mapillary?"
-
-msgid "Import"
-msgstr "Importar"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr "¡No se pudo importar una imagen geoetiquetada a la capa Mapillary!"
-
-msgid "{0} ({1} images)"
-msgstr "{0} ({1} imágenes)"
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr "¿Desde qué origen desea importar las imágenes a la capa Mapillary?"
-
-msgid "There are currently no layers with geotagged images!"
-msgstr "¡Actualmente no hay acapas con imágenes geoetiquetadas!"
-
-msgid "Images from my file system"
-msgstr "Imágenes de mi sistema de archivos"
-
-msgid "Select the images you want to import"
-msgstr "Seleccione las imágenes que desea importar"
-
-msgid "All images in a directory"
-msgstr "Todas las imágenes en un directorio"
-
-msgid "Select directory to import images from"
-msgstr "Seleccione el directorio desde el cual importar las imágenes"
-
-msgid "From existing image layer"
-msgstr "Desde una capa de imágenes existente"
-
-msgid "Import exception"
-msgstr "Excepción de importación"
-
-msgid "Could not import the image ''{0}''!"
-msgstr "¡No se pudo importar la imagen ''{0}''!"
-
-msgid "Could not import the directory ''{0}''!"
-msgstr "¡No se pudo importar el directorio ''{0}''!"
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-"Una etiqueta con la clave <i>{0}</i> ya está presente en el objeto de OSM "
-"seleccionado."
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-"¿Desea realmente reemplazar el valor actual de <i>{0}</i> con el nuevo valor "
-"<i>{1}</i>?"
-
-msgid "Tag conflict"
-msgstr "Conflicto de etiquetas"
-
-msgid "Key copied to clipboard"
-msgstr "Clave copiada al portapapeles"
-
-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 ""
-"El complemento Mapillary ahora utiliza un panel separado para mostrar "
-"información adicional (como la clave de la imagen) y acciones para la imagen "
-"de Mapillary seleccionada actualmente (como verla en un navegador web)."
-
-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 ""
-"Se puede activar haciendo clic en el botón izquierdo en la parte inferior de "
-"este mensaje o en el botón de la barra de herramientas a la izquierda, que "
-"utiliza el mismo icono."
-
-msgid "I got it, close this."
-msgstr "Lo tengo, cerrar esto."
-
-msgid "Image info"
-msgstr "Información de la imagen"
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-"Muestra la información detallada sobre la imagen de Mapillary seleccionada"
-
-msgid "Show detections on top of image"
-msgstr "Mostrar las detecciones en la parte superior de la imagen"
-
-msgid "View in browser"
-msgstr "Ver en el navegador"
-
-msgid "Copy key"
-msgstr "Copiar clave"
-
-msgid "Add Mapillary tag"
-msgstr "Añadir etiqueta mapillary"
-
-msgid "Image detections"
-msgstr "Detecciones de imágenes"
-
-msgid "Image actions"
-msgstr "acciones de imagen"
-
-msgid "Image key"
-msgstr "clave de imagen"
-
-msgid "Sequence key"
-msgstr "clave de secuencia"
-
-msgid "{0} detections"
-msgstr "{0} detecciones"
-
-msgid "image has no key"
-msgstr "la imagen no tiene clave"
-
-msgid "unknown user"
-msgstr "usuario desconocido"
-
-msgid "sequence has no key"
-msgstr "la secuencia no tiene clave"
-
-msgid "Could not open the URL {0} in a browser"
-msgstr "No se pudo abrir la URL {0} en un navegador"
-
-msgid "Downloading map objects…"
-msgstr "Descargando objetos de mapas..."
-
-msgid "All map objects loaded."
-msgstr "Todos los objetos de mapa han sido cargados."
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-"Demasiados objetos de mapa, realice un acercamiento para verlos a todos"
-
-msgid "Downloading map objects failed!"
-msgstr "¡La descarga de objetos de mapa ha fallado!"
-
-msgid "Mapillary objects"
-msgstr "Objetos Mapillary"
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-"Muestra objetos detectados por Mapillary a partir de sus imágenes de nivel "
-"de calle"
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] "Eliminada {0} imágen"
-msgstr[1] "Eliminadas {0} imágenes"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "Importada {0} imágen"
-msgstr[1] "Importadas {0} imágenes"
-
-msgid "2 images joined"
-msgstr "2 imágenes unidas"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "{0} imagen movida"
-msgstr[1] "{0} imágenes movidas"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "{0} imagen girada"
-msgstr[1] "{0} imágenes giradas"
-
-msgid "2 images unjoined"
-msgstr "2 imágenes  separadas"
-
-msgid "Could not read from URL {0}!"
-msgstr "¡No se pudo leer desde la URL {0}!"
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-"{0}\n"
-"No se pudo leer objetos del mapa desde la URL\n"
-"{1}!"
-
-msgid "everything in the visible area"
-msgstr "todo en la zona visible"
-
-msgid "areas with downloaded OSM-data"
-msgstr "áreas con datos OSM descargados"
-
-msgid "only when manually requested"
-msgstr "sólo cuando se solicitan manualmente"
-
-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 "Descargando"
-
-msgid "Select mode"
-msgstr "Modo selección"
-
-msgid "Mapillary login"
-msgstr "Acceso a Mapillary"
-
-msgid "Login successful, return to JOSM."
-msgstr "Acceso correcto, volver a JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Formato de imagen soportados (JPG y PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "Descargando imágenes de Mapillary"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Imágenes de Mapillary totales: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr "Enviando el conjunto de cambios de Mapillary"
-
-msgid "No images found"
-msgstr "No se encontraron las imágenes"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr "Subió {0} imágenes a mapillary.com"
-
-msgid "Finished upload"
-msgstr "Carga terminada"
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-"No se ha validado. Por favor, inicie sesión de Mapillary en Preferencias"
-
-msgid "Not Logged in to Mapillary"
-msgstr "No se encuentra conectado a Mapillary"
-
-msgid "Uploading: {0}"
-msgstr "Cargando: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -31750,6 +31396,113 @@ msgstr "No se ha encontrado una dirección para este objeto."
 msgid "An unexpected exception occurred:"
 msgstr "Ha ocurrido una excepción inesperada:"
 
+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 herramiento puede reemplazar únicamente un nodo, convertir un nodo en "
+"una 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) no pueden reemplazarse."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+"La relación no es un multipolígono, no puede ser usada como reemplazo."
+
+msgid "Replace geometry for node {0}"
+msgstr "Reemplazar la geometría para el nodo {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Por favor, seleccione una vía que exista en la base de datos y una vía nueva "
+"con geometría correcta."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "Las vías deben estar completamente dentro del área descargada."
+
+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 no puede tener nodos con propiedades o que sean "
+"miembros de relación excepto que pertenezcan a ambas vías."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"Se excedió el límite de iteraciones para el método robusto, se procederá con "
+"el método más simple."
+
+msgid "Replace geometry for way {0}"
+msgstr "Sustituir la geometría para la vía {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "¡Se han añadido demasiadas vías: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr "Generalización de edificios"
 
@@ -31786,9 +31539,30 @@ msgstr "Etiquetas de edificaciones"
 msgid "Cannot place building outside of the world."
 msgstr "No puede ubicar la edificación fuera del planeta."
 
+msgid "Add nodes for building"
+msgstr "Añadir nodos para edificios"
+
 msgid "Create building"
 msgstr "Crear edificación"
 
+msgid "Add address for building"
+msgstr "Añadir dirección para edificio"
+
+msgid "Set building shape to circle"
+msgstr "Dar al edificio forma de círculo"
+
+msgid "Set buildings shape to circle"
+msgstr "Dar a los edificios forma de círculo"
+
+msgid "Data: {0}"
+msgstr "Datos: {0}"
+
+msgid "Set building shape to rectangle"
+msgstr "Dar al edificio forma de rectángulo"
+
+msgid "Set buildings shape to rectangle"
+msgstr "Dar a los edificios forma de rectángulo"
+
 msgid "Set buildings size"
 msgstr "Establecer tamaño de la edificación"
 
@@ -31801,8 +31575,17 @@ msgstr "Autoseleccionar edificación"
 msgid "Use address nodes under buildings"
 msgstr "Usar los nodos dirección debajo de los edificios"
 
-msgid "Buildings width:"
-msgstr "Ancho de las edificaciones:"
+msgid "Circle"
+msgstr "Círculo"
+
+msgid "Rectangle"
+msgstr "Rectángulo"
+
+msgid "Set buildings size and shape"
+msgstr "Establecer la forma y tamaño de los edificios"
+
+msgid "Buildings width/diameter:"
+msgstr "Diámetro/ancho de los edificios"
 
 msgid "Length step:"
 msgstr "Longitud del paso:"
@@ -32035,7 +31818,7 @@ msgid "Add \"source=...\" to elements?"
 msgstr "¿Añadir etiqueta sobre la fuente a los elementos (source=...)?"
 
 msgid "Download from Cadastre"
-msgstr ""
+msgstr "Descargar del Catastro"
 
 msgid "Objects:"
 msgstr "Objetos:"
@@ -32117,10 +31900,10 @@ msgid "Recipient"
 msgstr "Destinatario"
 
 msgid "Diffusion restriction"
-msgstr ""
+msgstr "Restricción de difusión"
 
 msgid "Cadastre Edigeo files"
-msgstr ""
+msgstr "Archivos del Catastro Edigeo"
 
 msgid "Replace original background by JOSM background color."
 msgstr ""
@@ -32571,6 +32354,18 @@ msgstr "Eliminar el esquema seleccionado de la lista"
 msgid "Color Schemes"
 msgstr "Esquemas de color"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Cancelar la edición de etiquetas y cerrar el diálogo"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Aplicar etiquetas editadas y cerrar diálogo"
+
 msgid "Conflation"
 msgstr "Combinación"
 
@@ -33096,6 +32891,9 @@ msgstr "Abrir el panel de GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Acercar para ver los mensajes"
 
+msgid "Login"
+msgstr "Acceder"
+
 msgid "Enable autologin"
 msgstr "Habilitar acceso automático"
 
@@ -33128,24 +32926,15 @@ msgstr "Conversación privada"
 msgid "Close tab"
 msgstr "Cerrar pestaña"
 
+msgid "Logout"
+msgstr "Cerrar sesión"
+
 msgid "Clear log"
 msgstr "Limpiar registro"
 
 msgid "Show users on map"
 msgstr "Mostrar usuarios en el mapa"
 
-msgid "GeoJSON file"
-msgstr "Archivo GeoJSON"
-
-msgid "Loading json file..."
-msgstr "Cargando archivo JSON..."
-
-msgid "Data Layer from GeoJSON: "
-msgstr "Capa de datos de un archivo GeoJSON: "
-
-msgid "Error loading geojson file {0}"
-msgstr "Error al cargar el archivo GeoJSON {0}"
-
 msgid "Position only"
 msgstr "Solo posición"
 
@@ -33236,6 +33025,9 @@ msgstr "Importar Globalsat"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importar datos del Globalsat Datalogger DG100 en la capa gpx"
 
+msgid "Import"
+msgstr "Importar"
+
 msgid "GPS Blams"
 msgstr "GPS Blams"
 
@@ -33995,8 +33787,30 @@ msgstr "Tipo de estructura:"
 msgid "Offset into background:"
 msgstr "Valor de desviación respecto al origen:"
 
-msgid "Indoor Mapping Helper"
-msgstr "Asistente para el cartografiado de interiores"
+msgid "ConfirmObjectDrawing"
+msgstr "ConfirmarDibujoObjeto"
+
+msgid "ConfirmMultipolygonSelection"
+msgstr "ConfirmarSelecciónMultipolígono"
+
+msgid "Please insert a value."
+msgstr "Por favor ingrese un valor"
+
+msgid "Please press spacebar first to add \"outer\" object to relation."
+msgstr ""
+"Por favor oprima espacio primero para añadir un objeto ''outer'' a la "
+"relación"
+
+msgid "Relation-Error"
+msgstr "Error de relación"
+
+msgid "No data selected."
+msgstr "No hay datos seleccionados."
+
+msgid "No relation or no relation member with role \"outer\" selected."
+msgstr ""
+"No hay relación o no hay ningún miembro de la relación con el rol ''outer'' "
+"seleccionado."
 
 msgid "POWER"
 msgstr "COMENZAR"
@@ -34030,37 +33844,107 @@ msgstr ""
 msgid "Apply Tags"
 msgstr "Aplicar etiquetas"
 
-msgid "Fitting"
-msgstr "Ajustes"
+msgid "Add a new level"
+msgstr "Agregue un nuevo nivel"
 
 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>Tenga en cuenta que debe comenzar ajustando la imagen del plano del "
-"edificio.<br>Para ello utilice el componente PicLayer, el cual puede "
-"instalar utilizando el gestor de componentes de JOSM. </html>"
-
-msgid "Level Selection"
-msgstr "Selección de nivel"
+"<html> Por favor inserte un nuevo número de nivel que desea añadir.<br>  "
+"<i>Información</i>: <br> si se oprime el botón de Aceptar cambiará a la "
+"acción de dibujo.<br>Para finalizar el nuevo objeto por favor seleccione la "
+"barra espaciadora. El nuevo nivel<br>será etiquetado automáticamente. </html>"
 
-msgid "Lowest Level"
-msgstr "Nivel más bajo"
+msgid "level number:"
+msgstr "número de nivel"
 
-msgid "The lowest level of your building."
-msgstr "El nivel más inferior de tu edificio."
+msgid "Example: ''2'' or ''3''"
+msgstr "Ejemplo: ''2'' o ''3''"
 
-msgid "Highest Level"
-msgstr "Nivel más alto"
-
-msgid "The highest level of your building."
-msgstr "El nivel más superior de tu edificio."
+msgid "Indoor Mapping Helper"
+msgstr "Asistente para el cartografiado de interiores"
 
 msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 "Caja de herramientas para el asistente de cartografiado de interiores"
 
+msgid "Insert level"
+msgstr "Ingrese nivel"
+
+msgid "Add a new level to layer."
+msgstr "Añade un nuevo nivel a la capa"
+
+msgid "<html><b>?</strong></b>"
+msgstr "<html><b>¿?</strong></b>"
+
+msgid "Show Help-Browser."
+msgstr "Mostrar el navegador de la ayuda."
+
+msgid "Level name"
+msgstr "Nombre del nivel"
+
+msgid "Sets optional name tag for a level."
+msgstr "Establece una etiqueta opcional de nombre para el nivel"
+
+msgid "Working level: NONE"
+msgstr "Nivel actual: NINGUNO"
+
+msgid "Shows the current working level."
+msgstr "Muestra el nivel actual en el que se está trabajando"
+
+msgid "Deactivate automatic level tagging."
+msgstr "Desactivar el etiquetado automático de niveles"
+
+msgid "Sets the name tag."
+msgstr "Establece la etiqueta de nombre"
+
+msgid "Sets the referance tag."
+msgstr "Establece la etiqueta de referencia"
+
+msgid "Repeat on"
+msgstr "Repetir en"
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+"Establece la etiqueta de repetir on cuando los objetos de vía ya han sido "
+"seleccionados. Por favor etiqueta como se muestra a continuación: -3-4 o -2--"
+"3 o 5-6 ."
+
+msgid "OUTER"
+msgstr "EXTERIOR"
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+"Herramienta de Creación para multipolígono con el rol outer. Para finalizar "
+"oprima la barra espaciadora."
+
+msgid "INNER"
+msgstr "INTERIOR"
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+"Herramienta de Creación para multipolígonos con el rol inner. Para finalizar "
+"oprima la barra espaciadora. Para añadirlo a la relación seleccione "
+"''outer'' y oprima Entrar."
+
+msgid "Deactivate multipolygon function."
+msgstr "Desactivar la función multipolígono."
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr "Añadir las etiquetas y/o relaciones y/u objetos seleccionadoos"
+
+msgid "Working level: {0}"
+msgstr "Nivel actual: {0}"
+
 msgid "InfoMode"
 msgstr "ModoInfo"
 
@@ -35249,6 +35133,27 @@ msgstr "Extensión de archivos desconocida: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "El análisis sintáctivo del archivo \"{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"
 
@@ -35531,6 +35436,8 @@ msgstr "No se pudo procesar el archivo ''{0}'':"
 msgid ""
 "Writing position information to image files... Estimated time left: {0}"
 msgstr ""
+"Escribiendo la información de posición en los archivos de imagen... Tiempo "
+"estimado para terminar: {0}"
 
 msgid "File could not be deleted!"
 msgstr "¡No se pudo eliminar el archivo!"
@@ -35592,6 +35499,9 @@ msgstr "Editar los datos GPS de la fotografía"
 msgid "Please select an image first."
 msgstr "Por favor, seleccione un imagen primero"
 
+msgid "No image selected"
+msgstr "Ninguna imagen seleccionada"
+
 msgid "(Empty values delete the according fields.)"
 msgstr "(Eliminar los valores vacíos según los campos.)"
 
@@ -36020,10 +35930,10 @@ msgid "PT_Assistant Proceed Request"
 msgstr "PT_Assistant procedió a la solicitud"
 
 msgid "Bicycle and foot routes Tests"
-msgstr ""
+msgstr "Pruebas de rutas pedestres y bicisendas"
 
 msgid "PT: There is a gap in the "
-msgstr ""
+msgstr "PT: hay un agujero en "
 
 msgid "PT: Stop_position is not part of a way"
 msgstr "PT: La posición de parada no es parte de una vía"
@@ -36060,6 +35970,8 @@ msgstr "PT: advertencia de ensayo simulado"
 
 msgid "PT: Route needs to be sorted, found tag fixme:relation=order members"
 msgstr ""
+"PT: la ruta debe ser ordenada, se encontró una etiqueta fixme:relation=order "
+"members"
 
 msgid "PT: Route contains a gap that can be fixed by sorting"
 msgstr "PT: La ruta contiene un vacío que puede ser arreglado si se ordena"
@@ -36072,23 +35984,27 @@ msgstr ""
 "Se requerirán además otras validaciones"
 
 msgid "PT: Route gap can be closed by adding a single way"
-msgstr ""
+msgstr "PT: el corte en la ruta puede ser cerrado añadiendo una vía simple"
 
 msgid ""
 "PT: The name of the first stop does not match the \"from\" tag of the route "
 "relation"
 msgstr ""
+"PT: el nombre de la primer parada no concuerda con la etiqueta \"from\" de "
+"la relación de ruta"
 
 msgid ""
 "PT: The name of the last stop does not match the \"to\" tag of the route "
 "relation"
 msgstr ""
+"PT: el nombre de la última parada no concuerda con la etiqueta \"to\" de la "
+"relación de ruta"
 
 msgid "PT: The first stop of the route does not match the first way"
-msgstr ""
+msgstr "PT: la primer parada de la ruta no concuerda con la primer vía"
 
 msgid "PT: The last stop of the route does not match the last way"
-msgstr ""
+msgstr "PT: la última parada de la ruta no concuerda con la última vía"
 
 msgid "PT: Route should start and end with a stop_position"
 msgstr "PT: La ruta debe empezar y terminar con una posición de parada"
@@ -36366,6 +36282,9 @@ msgstr "implícito"
 msgid "State"
 msgstr "Estado/Provincia"
 
+msgid "pending"
+msgstr "pendiente"
+
 msgid "[incomplete]"
 msgstr "[incompleto]"
 
@@ -36789,12 +36708,6 @@ msgstr "Nuevo valor de {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr "Falta la preferencia ''{0}''. No se puede inicializar SdsApi."
 
-msgid "Failed to open connection to API {0}."
-msgstr "Fallo al abrir la conexión de la API {0}."
-
-msgid "Proxy Authentication Required"
-msgstr "Autenticación de proxy requerida"
-
 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>"
@@ -36923,10 +36836,10 @@ msgid "Select a map object"
 msgstr "Seleccione un objeto del mapa"
 
 msgid "Please enter minimal distance in metres"
-msgstr ""
+msgstr "Por favor ingrese una distancia mínima en metros"
 
 msgid "Please enter numeric angle in degrees"
-msgstr ""
+msgstr "Por favor introduce el valor del ángulo en grados"
 
 msgid "Shape actions panel"
 msgstr "Panel de acciones de forma"
@@ -37162,12 +37075,6 @@ msgstr "Complemento JOSM Tag Editor"
 msgid "Presets"
 msgstr "Predefinidos"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Cancelar la edición de etiquetas y cerrar el diálogo"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Aplicar etiquetas editadas y cerrar diálogo"
-
 msgid "Highlight"
 msgstr "Resaltado"
 
@@ -38920,48 +38827,6 @@ msgstr ""
 "Esta herramienta reemplaza la geometría de un objeto con otro, y requiere "
 "que 2 y solo 2 objetos sean seleccionados"
 
-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 herramiento puede reemplazar únicamente un nodo, convertir un nodo en "
-"una 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) no pueden reemplazarse."
-
-msgid "Replace geometry for node {0}"
-msgstr "Reemplazar la geometría para el nodo {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-"La relación no es un multipolígono, no puede ser usada como reemplazo."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Por favor, seleccione una vía que exista en la base de datos y una vía nueva "
-"con geometría correcta."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "Las vías deben estar completamente dentro del área descargada."
-
-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 no puede tener nodos con propiedades o que sean "
-"miembros de relación excepto que pertenezcan a ambas vías."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"Se excedió el límite de iteraciones para el método robusto, se procederá con "
-"el método más simple."
-
-msgid "Replace geometry for way {0}"
-msgstr "Sustituir la geometría para la vía {0}"
-
 msgid "Replace Membership"
 msgstr "Remplazar pertenencia"
 
@@ -39042,9 +38907,6 @@ msgstr "Seleccionar nodos intermedios"
 msgid "Please select two nodes connected by way!"
 msgstr "¡Por favor, seleccione dos nodos conectados por una vía!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "¡Se han añadido demasiadas vías: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Todo lo de dentro"
 
@@ -39347,15 +39209,17 @@ msgstr[1] ""
 "¿Sobrescribir las etiquetas ''{0}'' {1} de {2} con el nuevo valor ''{3}''?"
 
 msgid "Download from Sophox API"
-msgstr ""
+msgstr "Descargar desde Sophox API"
 
 msgid ""
 "Find places of education at least 2km, and at most 3km from the center of "
 "the selection"
 msgstr ""
+"Encontrar lugares de educación que estén entre 2 y 3 km del centro de la "
+"selección."
 
 msgid "Show/hide Sophox snippet list"
-msgstr ""
+msgstr "Mostrar/esconder la lista de snippet Sophox"
 
 msgid "help"
 msgstr "ayuda"
diff --git a/i18n/po/et.po b/i18n/po/et.po
index 6fe5f39..b64220d 100644
--- a/i18n/po/et.po
+++ b/i18n/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2017-02-23 08:40+0000\n"
 "Last-Translator: Margus Värton <margus at dakar.ee>\n"
 "Language-Team: Estonian <et at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:41+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:41+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: et\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -988,8 +988,8 @@ msgstr "Sisesta link, kust alla laadida."
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Sisesta URL, kust andmeid laadida."
 
-msgid "Separate Layer"
-msgstr "Eralda kiht."
+msgid "Download as new layer"
+msgstr "Laadi alla uue kihina"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Vali, kas andmed tuleb alla laadida uude kihti"
@@ -2321,12 +2321,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"
@@ -8364,9 +8364,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr "Laadi alla uue kihina"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9862,6 +9859,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12931,9 +12931,6 @@ msgstr "Kaugjuhtimine"
 msgid "Settings for the remote control feature."
 msgstr "Kaugjuhtimise funktsiooni seaded."
 
-msgid "Download objects to new layer"
-msgstr "Objektid laaditakse alla uude andmekihti"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Kinnita kõik Kaugjuhtimise toimingud käsitsi"
 
@@ -14656,6 +14653,10 @@ msgstr "Säilita plugin"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Klõpsa, et säilitada plugin ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr ""
 
@@ -14665,10 +14666,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 ""
@@ -16517,10 +16514,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -18006,6 +17999,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -18027,6 +18023,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20680,6 +20679,12 @@ msgstr "Purskaev"
 msgid "Water Well"
 msgstr "Veekaev"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Majakas"
 
@@ -23751,6 +23756,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 ""
 
@@ -23832,7 +23864,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23847,7 +23879,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 ""
@@ -23855,21 +23887,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 ""
 
@@ -24008,13 +24062,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"
@@ -24047,14 +24101,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 ""
@@ -24120,7 +24174,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)"
@@ -24207,13 +24261,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)"
@@ -24381,34 +24435,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 ""
@@ -24416,7 +24469,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)"
@@ -24464,7 +24517,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24472,7 +24525,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 ""
@@ -24641,8 +24694,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 ""
@@ -24650,9 +24702,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 ""
@@ -24660,10 +24710,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"
@@ -24696,57 +24746,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 ""
@@ -24754,13 +24799,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 ""
@@ -24828,13 +24873,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 ""
@@ -24842,7 +24887,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24850,7 +24895,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24858,19 +24903,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 ""
@@ -24975,13 +25020,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 ""
@@ -24989,7 +25034,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)"
@@ -25083,13 +25128,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 ""
 
@@ -25177,6 +25215,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 ""
 
@@ -25185,6 +25237,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 ""
 
@@ -25192,13 +25268,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 ""
@@ -25212,7 +25288,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 ""
@@ -25220,29 +25296,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)"
@@ -25311,7 +25386,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"
@@ -25344,6 +25422,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 ""
 
@@ -25392,33 +25476,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 ""
@@ -25426,7 +25508,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)"
@@ -25472,25 +25554,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"
@@ -25514,7 +25596,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)"
@@ -25610,7 +25692,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 ""
@@ -25618,6 +25700,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 ""
 
@@ -25636,7 +25725,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)"
@@ -25698,7 +25787,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 ""
@@ -25706,13 +25795,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)"
@@ -25799,7 +25888,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 ""
@@ -25807,7 +25903,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"
@@ -25822,6 +25918,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26813,32 +26915,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"
+"unusual value of {0}: tonne 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 ""
-
-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"
@@ -26847,9 +26945,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 ""
 
@@ -26956,6 +27051,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 ""
 
@@ -26999,6 +27097,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."
@@ -27032,6 +27133,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -27079,6 +27183,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 "Kasuta JOSMis väliseid skripte"
 
@@ -27250,6 +27359,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 ""
@@ -28042,550 +28154,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 ""
 
@@ -29290,6 +28858,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 ""
 
@@ -29323,9 +28989,30 @@ msgstr "Ehitiste sildid:"
 msgid "Cannot place building outside of the world."
 msgstr "Hoone peab asuma Maal."
 
+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 "Seadista hoone suurust"
 
@@ -29338,8 +29025,17 @@ msgstr ""
 msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Buildings width:"
-msgstr "hoone laius"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr ""
@@ -30018,6 +29714,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 ""
 
@@ -30512,6 +30220,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30544,22 +30255,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"
@@ -30649,6 +30351,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31340,7 +31045,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"
@@ -31373,31 +31096,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"
@@ -32489,6 +32273,27 @@ msgstr "Tundmatu faililaiend: {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 ""
 
@@ -32822,6 +32627,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33559,6 +33367,9 @@ msgstr ""
 msgid "State"
 msgstr "Riik"
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33969,12 +33780,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>"
@@ -34311,12 +34116,6 @@ msgstr ""
 msgid "Presets"
 msgstr "Eelseaded"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35862,39 +35661,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 ""
 
@@ -35968,9 +35734,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/eu.po b/i18n/po/eu.po
index e5a2743..2b65b1c 100644
--- a/i18n/po/eu.po
+++ b/i18n/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2015-03-09 16:55+0000\n"
 "Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
 "Language-Team: Basque <eu at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 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"
 "Language: eu\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -972,8 +972,8 @@ msgstr "Sartu deskargatu nahi duzun URL-a"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Sartu datuak deskargatu behar direneko URL-a"
 
-msgid "Separate Layer"
-msgstr "Geruza banatu"
+msgid "Download as new layer"
+msgstr "Geruza berri bezala deskargatu"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Aukeratu hau, datuak kapa berri batean deskargatu nahi badituzu"
@@ -2332,12 +2332,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"
@@ -8436,9 +8436,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr "Geruza berri bezala deskargatu"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9891,6 +9888,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12936,9 +12936,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 ""
 
@@ -14631,6 +14628,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 ""
 
@@ -14640,10 +14641,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 ""
@@ -16472,10 +16469,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17961,6 +17954,9 @@ msgstr "Biodiesela"
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "91 oktano"
 
@@ -17982,6 +17978,9 @@ msgstr "E10 (%10eko etanol nahastea)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (%85eko etanol nahastea)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPF (Petroliotik likidotutako gasa)"
 
@@ -20635,6 +20634,12 @@ msgstr "Iturria"
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Itsasargia"
 
@@ -23706,6 +23711,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 ""
 
@@ -23787,7 +23819,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23802,7 +23834,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 ""
@@ -23810,21 +23842,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 ""
 
@@ -23963,13 +24017,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"
@@ -24002,14 +24056,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 ""
@@ -24075,7 +24129,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)"
@@ -24162,13 +24216,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)"
@@ -24336,34 +24390,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 ""
@@ -24371,7 +24424,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)"
@@ -24419,7 +24472,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24427,7 +24480,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 ""
@@ -24596,8 +24649,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 ""
@@ -24605,9 +24657,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 ""
@@ -24615,10 +24665,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"
@@ -24651,57 +24701,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 ""
@@ -24709,13 +24754,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 ""
@@ -24783,13 +24828,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 ""
@@ -24797,7 +24842,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24805,7 +24850,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24813,19 +24858,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 ""
@@ -24930,13 +24975,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 ""
@@ -24944,7 +24989,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)"
@@ -25038,13 +25083,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 ""
 
@@ -25132,6 +25170,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 ""
 
@@ -25140,6 +25192,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 ""
 
@@ -25147,13 +25223,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 ""
@@ -25167,7 +25243,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 ""
@@ -25175,29 +25251,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)"
@@ -25266,7 +25341,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"
@@ -25299,6 +25377,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 ""
 
@@ -25347,33 +25431,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 ""
@@ -25381,7 +25463,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)"
@@ -25427,25 +25509,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"
@@ -25469,7 +25551,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)"
@@ -25565,7 +25647,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 ""
@@ -25573,6 +25655,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 ""
 
@@ -25591,7 +25680,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)"
@@ -25653,7 +25742,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 ""
@@ -25661,13 +25750,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)"
@@ -25754,7 +25843,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 ""
@@ -25762,7 +25858,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"
@@ -25777,6 +25873,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26768,32 +26870,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"
@@ -26802,9 +26900,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 ""
 
@@ -26911,6 +27006,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 ""
 
@@ -26954,6 +27052,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."
@@ -26988,6 +27089,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -27039,6 +27143,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 ""
 
@@ -27210,6 +27319,9 @@ msgstr ""
 "Uneotan ikusgai den pantailako arearekin elkarguneak dauzkaten GPX/OSM "
 "fitxategiak irekitzen uzten digu."
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -28025,550 +28137,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 ""
 
@@ -29263,6 +28831,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 ""
 
@@ -29296,9 +28962,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 ""
 
@@ -29311,8 +28998,17 @@ msgstr ""
 msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Buildings width:"
-msgstr "Eraikinen zabalera:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr ""
@@ -29990,6 +29686,18 @@ msgstr ""
 msgid "Color Schemes"
 msgstr "Kolore-eskemak"
 
+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 ""
 
@@ -30484,6 +30192,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30516,22 +30227,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"
@@ -30621,6 +30323,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31310,7 +31015,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"
@@ -31343,31 +31066,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"
@@ -32448,6 +32232,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 ""
 
@@ -32781,6 +32586,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33518,6 +33326,9 @@ msgstr ""
 msgid "State"
 msgstr "Estatua"
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33928,12 +33739,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>"
@@ -34270,12 +34075,6 @@ msgstr ""
 msgid "Presets"
 msgstr "Aurrezarpenak"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35816,39 +35615,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 ""
 
@@ -35922,9 +35688,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/fa.po b/i18n/po/fa.po
index b1cb062..ef8bfcf 100644
--- a/i18n/po/fa.po
+++ b/i18n/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2014-03-18 07:32+0000\n"
 "Last-Translator: Saeed Ghazi Joolaee <Unknown>\n"
 "Language-Team: Persian <fa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:57+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:57+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: fa\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -994,8 +994,8 @@ msgstr "وارد کردن آدرس برای دانلود:"
 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 "اگر داده ها باید داخل لایه ی جدید دانلود شوند انتخاب کنید"
@@ -2310,12 +2310,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"
@@ -8314,9 +8314,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>"
@@ -9774,6 +9771,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12816,9 +12816,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 ""
 
@@ -14511,6 +14508,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 ""
 
@@ -14520,10 +14521,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 ""
@@ -16347,10 +16344,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17836,6 +17829,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17857,6 +17853,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20510,6 +20509,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23581,6 +23586,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 ""
 
@@ -23662,7 +23694,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23677,7 +23709,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 ""
@@ -23685,21 +23717,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 ""
 
@@ -23838,13 +23892,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"
@@ -23877,14 +23931,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 ""
@@ -23950,7 +24004,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)"
@@ -24037,13 +24091,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)"
@@ -24211,34 +24265,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 ""
@@ -24246,7 +24299,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)"
@@ -24294,7 +24347,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24302,7 +24355,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 ""
@@ -24471,8 +24524,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 ""
@@ -24480,9 +24532,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 ""
@@ -24490,10 +24540,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"
@@ -24526,57 +24576,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 ""
@@ -24584,13 +24629,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 ""
@@ -24658,13 +24703,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 ""
@@ -24672,7 +24717,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24680,7 +24725,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24688,19 +24733,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 ""
@@ -24805,13 +24850,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 ""
@@ -24819,7 +24864,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)"
@@ -24913,13 +24958,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 ""
 
@@ -25007,6 +25045,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 ""
 
@@ -25015,6 +25067,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 ""
 
@@ -25022,13 +25098,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 ""
@@ -25042,7 +25118,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 ""
@@ -25050,29 +25126,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)"
@@ -25141,7 +25216,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"
@@ -25174,6 +25252,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 ""
 
@@ -25222,33 +25306,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 ""
@@ -25256,7 +25338,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)"
@@ -25302,25 +25384,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"
@@ -25344,7 +25426,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)"
@@ -25440,7 +25522,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 ""
@@ -25448,6 +25530,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 ""
 
@@ -25466,7 +25555,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)"
@@ -25528,7 +25617,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 ""
@@ -25536,13 +25625,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)"
@@ -25629,7 +25718,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 ""
@@ -25637,7 +25733,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"
@@ -25652,6 +25748,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26643,32 +26745,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"
@@ -26677,9 +26775,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 ""
 
@@ -26786,6 +26881,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 ""
 
@@ -26829,6 +26927,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."
@@ -26862,6 +26963,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26909,6 +27013,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 ""
 
@@ -27074,6 +27183,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 ""
@@ -27863,550 +27975,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 ""
 
@@ -29101,6 +28669,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 ""
 
@@ -29134,9 +28800,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 ""
 
@@ -29149,7 +28836,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:"
@@ -29828,6 +29524,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 ""
 
@@ -30322,6 +30030,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30354,22 +30065,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"
@@ -30459,6 +30161,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31148,7 +30853,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"
@@ -31181,31 +30904,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"
@@ -32286,6 +32070,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 ""
 
@@ -32619,6 +32424,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33356,6 +33164,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33766,12 +33577,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>"
@@ -34108,12 +33913,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35654,39 +35453,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 ""
 
@@ -35760,9 +35526,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/fi.po b/i18n/po/fi.po
index ff8fd84..19e3154 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.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-05 05:37+0000\n"
-"Last-Translator: Nka Mapper <Unknown>\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-23 16:02+0000\n"
+"Last-Translator: Janne Ertman <Unknown>\n"
 "Language-Team: Finnish <fi 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:42+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:42+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: fi\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -510,7 +510,7 @@ msgid "Duplicate"
 msgstr "Monista"
 
 msgid "Duplicate selection."
-msgstr ""
+msgstr "Monista valinta."
 
 msgid "Exit"
 msgstr "Poistu"
@@ -949,7 +949,7 @@ msgid "Create a new map layer."
 msgstr "Luo uusi kartta taso."
 
 msgid "URL Files"
-msgstr ""
+msgstr "URL-tiedostot"
 
 msgid "Open..."
 msgstr "Avaa..."
@@ -1019,8 +1019,8 @@ msgstr "Anna ladattavan alueen URL-osoite:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Syötä URL jonka tiedot pitäisi ladata"
 
-msgid "Separate Layer"
-msgstr "Uusi taso"
+msgid "Download as new layer"
+msgstr "Lataa uutena tasona"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Valitse, ladataanko data uudelle tasolle"
@@ -2429,12 +2429,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"
@@ -8714,9 +8714,6 @@ msgstr "Leveyspiirin arvo välillä [-90,90] tarvitaan."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Pituuspiirin arvo välillä [-180,180] tarvitaan."
 
-msgid "Download as new layer"
-msgstr "Lataa uutena tasona"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10339,6 +10336,9 @@ msgstr "Tiedostosta ''{0}'' ei löytynyt dataa."
 msgid "Open OSM file"
 msgstr "Avaa OSM-tiedosto"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -13479,9 +13479,6 @@ msgstr "Etähallinta"
 msgid "Settings for the remote control feature."
 msgstr "JOSMin etähallintaa koskevat asetukset"
 
-msgid "Download objects to new layer"
-msgstr "Lataa karttakohteet aina uudelle datatasolle"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Pyydä vahvistus kaikille etähallinnan toiminnoille"
 
@@ -15262,6 +15259,11 @@ msgstr "Pidä liitännäinen"
 msgid "Click to keep the plugin ''{0}''"
 msgstr ""
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Liitännäisen ''{0}'' asennus epäonnistui väliaikaistiedostosta ''{1}''. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr ""
 
@@ -15271,11 +15273,6 @@ msgid ""
 msgstr ""
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Liitännäisen ''{0}'' asennus epäonnistui väliaikaistiedostosta ''{1}''. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -17139,10 +17136,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -18630,6 +18623,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -18651,6 +18647,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -21304,6 +21303,12 @@ msgstr "Suihkulähde"
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Majakka"
 
@@ -24376,6 +24381,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 ""
 
@@ -24457,7 +24489,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -24472,7 +24504,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 ""
@@ -24480,21 +24512,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 ""
 
@@ -24633,13 +24687,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"
@@ -24672,14 +24726,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 ""
@@ -24745,7 +24799,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)"
@@ -24832,13 +24886,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)"
@@ -25006,34 +25060,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 ""
@@ -25041,7 +25094,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)"
@@ -25089,7 +25142,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -25097,7 +25150,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 ""
@@ -25266,8 +25319,7 @@ msgstr ""
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr "Saksan Ruhrin alueen ilmakuvat (10 cm erotuskyky)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -25275,9 +25327,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 ""
@@ -25285,10 +25335,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"
@@ -25321,57 +25371,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 ""
@@ -25379,13 +25424,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 ""
@@ -25453,13 +25498,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 ""
@@ -25467,7 +25512,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -25475,7 +25520,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -25483,19 +25528,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 ""
@@ -25600,13 +25645,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 ""
@@ -25614,7 +25659,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)"
@@ -25708,13 +25753,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 ""
 
@@ -25802,6 +25840,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 ""
 
@@ -25810,6 +25862,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 ""
 
@@ -25817,13 +25893,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 ""
@@ -25837,7 +25913,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 ""
@@ -25845,29 +25921,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)"
@@ -25936,7 +26011,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"
@@ -25969,6 +26047,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 ""
 
@@ -26017,33 +26101,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 ""
@@ -26051,7 +26133,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)"
@@ -26097,25 +26179,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"
@@ -26139,7 +26221,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)"
@@ -26235,7 +26317,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 ""
@@ -26243,6 +26325,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 ""
 
@@ -26261,7 +26350,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 ""
 
 msgid "Aşgabat (high resolution)"
@@ -26323,7 +26412,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 ""
@@ -26331,13 +26420,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)"
@@ -26424,7 +26513,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 ""
@@ -26432,7 +26528,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"
@@ -26447,6 +26543,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -27446,37 +27548,29 @@ 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"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual {0} format"
-msgstr "epätavallinen {0} arvo"
-
 msgid ""
-"{0}: kilometers 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}: oletusyksikkö kilometrejä; desimaalierotin on piste; jos merkkaat "
-"yksikön, arvon jälkeen väli ennen yksikköä"
 
-msgid "voltage should be in volts with no units/delimiter/spaces"
-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 ""
-"epätavallinen muoto raideleveydelle; syötä millimetreinä ilman erotinmerkkejä"
 
-msgid "unusual incline; use percentages/degrees or up/down"
+msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
-"epätavallinen jyrkkyysmerkintä; käytä prosentteja, asteita, tai up/down"
 
 msgid "{0} must be a numeric value"
 msgstr ""
@@ -27484,9 +27578,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 ""
 
@@ -27593,6 +27684,9 @@ msgstr "Piilota kuvakkeet näytettäessä suuri alue"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Häivytä pisteet asteittain näkyvistä tarkennettaessa kauemmas"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Näytä katujen nimet (lähelle tarkennettaessa)"
 
@@ -27638,6 +27732,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."
@@ -27673,6 +27770,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -27724,6 +27824,11 @@ msgstr "Näyttää GPX-tiedoston korkeusprofiilin ja joitain tilastotietoja."
 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 ""
 
@@ -27902,6 +28007,9 @@ msgstr ""
 "Avaa valituista tiedostoista vain nykyiseen näkymään osuvat gpx- tai osm-"
 "tiedostot."
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -28720,550 +28828,6 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr "Mapillary-kuvat"
-
-msgid "Mapillary layer"
-msgstr "Mapillary-taso"
-
-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 "Lataa kuvat näkymän alueelta Mapillaryn palvelimelta."
-
-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 ""
 
@@ -29964,6 +29528,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 "Polkujen tulee olla kokonaan ladatulla alueella."
+
+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 ""
 
@@ -29997,9 +29659,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 ""
 
@@ -30012,7 +29695,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:"
@@ -30703,6 +30395,18 @@ msgstr "Poista valittu väriteema listasta."
 msgid "Color Schemes"
 msgstr "Väriteemat"
 
+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 ""
 
@@ -31197,6 +30901,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -31229,22 +30936,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"
@@ -31334,6 +31032,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -32040,7 +31741,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"
@@ -32073,31 +31792,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"
@@ -33197,6 +32977,27 @@ msgstr "Tuntematon tiedostopääte: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Tiedoston \"{0}\" tulkitseminen epäonnistui"
 
+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 ""
 
@@ -33532,6 +33333,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -34274,6 +34078,9 @@ msgstr ""
 msgid "State"
 msgstr "Osavaltio"
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -34687,12 +34494,6 @@ msgstr "Uusi arvo {0}:lle"
 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>"
@@ -35030,12 +34831,6 @@ msgstr ""
 msgid "Presets"
 msgstr "Esivalinnat"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -36620,39 +36415,6 @@ msgstr ""
 "Tämä työkalu korvaa objektin geometrian toisella, joten se vaatii että "
 "valittuna on tasan kaksi objektia"
 
-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 "Polkujen tulee olla kokonaan ladatulla alueella."
-
-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 ""
 
@@ -36728,9 +36490,6 @@ msgstr "Valitse keskimmäiset pisteet"
 msgid "Please select two nodes connected by way!"
 msgstr "Valitse kaksi pistettä jotka ovat samassa polussa"
 
-msgid "Too many ways are added: {0}!"
-msgstr ""
-
 msgid "All inside [testing]"
 msgstr "Valitun polun sisäpuolella olevat kohteet"
 
@@ -37173,7 +36932,7 @@ msgid "View UNESCO sheet"
 msgstr ""
 
 msgid "View %name% image"
-msgstr ""
+msgstr "Näytä %name% kuva"
 
 msgid "View %name% sheet of river"
 msgstr ""
@@ -37185,10 +36944,10 @@ msgid "View %name% sheet on osm.fr"
 msgstr ""
 
 msgid "View %name% map of municipalities"
-msgstr ""
+msgstr "Näytä %name% kuntien kartta"
 
 msgid "View %name% list of municipalities"
-msgstr ""
+msgstr "Näytä% name% kuntaluettelo"
 
 msgid "View %name% map of cantons"
 msgstr ""
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index 180371e..ed771db 100644
--- a/i18n/po/fil.po
+++ b/i18n/po/fil.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2011-06-19 14:15+0000\n"
 "Last-Translator: Anthony Balico <Unknown>\n"
 "Language-Team: Filipino <fil at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:10+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:10+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: fil\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/fo.po b/i18n/po/fo.po
index b4719a5..cd5ff12 100644
--- a/i18n/po/fo.po
+++ b/i18n/po/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2015-02-28 16:15+0000\n"
 "Last-Translator: LiFo <Unknown>\n"
 "Language-Team: Faroese <fo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:42+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:42+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr "{0}: valmøguleiki ''{1}'' er tvítýddur"
@@ -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/fr.po b/i18n/po/fr.po
index 19d8004..1c56c85 100644
--- a/i18n/po/fr.po
+++ b/i18n/po/fr.po
@@ -5,16 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-27 09:42+0000\n"
-"Last-Translator: Jérôme <Unknown>\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-27 14:41+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:43+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:43+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: fr\n"
 "X-Poedit-Bookmarks: -1,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
 
@@ -1047,7 +1047,7 @@ msgstr "Entrez l’adresse web de téléchargement :"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Entrer l’adresse web depuis laquelle les données seront téléchargées"
 
-msgid "Separate Layer"
+msgid "Download as new layer"
 msgstr "Télécharger dans un nouveau calque"
 
 msgid "Select if the data should be downloaded into a new layer"
@@ -2471,19 +2471,13 @@ msgstr "Convertir en fichier GPX à partir du dernier membre"
 
 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 ""
-"Réduire cette relation à une seule trace GPX de manière récursive, en "
-"commençant pas le(s) premier(s) membres(s), en continuant ainsi jusqu’au(x) "
-"dernier(s)."
 
 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 ""
-"Réduire cette relation à une seule trace GPX de manière récursive, en "
-"commençant pas le(s) dernier (s) membres(s), en continuant ainsi jusqu’au(x) "
-"premier(s)."
 
 msgid "Selected Relations"
 msgstr "Relations sélectionnées"
@@ -9021,9 +9015,6 @@ msgstr "La latitude doit être dans la plage [-90,90]."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "La longitude doit être dans la plage [-180,180]."
 
-msgid "Download as new layer"
-msgstr "Télécharger dans un nouveau calque"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10733,6 +10724,9 @@ msgstr "Aucune donnée trouvée dans le fichier ''{0}''."
 msgid "Open OSM file"
 msgstr "Ouvrir un fichier OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr "Fichiers d erreur de validation"
 
@@ -14113,9 +14107,6 @@ msgstr "Contrôle à distance"
 msgid "Settings for the remote control feature."
 msgstr "Utilisez le contrôle à distance."
 
-msgid "Download objects to new layer"
-msgstr "Télécharger les objets dans un nouveau calque"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Confirmer manuellement toutes les actions du contrôle à distance"
 
@@ -16107,6 +16098,12 @@ msgstr "Garder le greffon"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Garder le greffon ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Impossible dʼinstaller le greffon ''{0}'' depuis le fichier temporaire "
+"téléchargé ''{1}''. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Impossible de supprimer le plugin périmé \"{0}\"."
 
@@ -16118,12 +16115,6 @@ msgstr ""
 "lʼinstallation. JOSM va charger lʼancienne version du greffon."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Impossible dʼinstaller le greffon ''{0}'' depuis le fichier temporaire "
-"téléchargé ''{1}''. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -18130,10 +18121,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "toit"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "kiosque"
-
 msgid "Start date"
 msgstr "Date de mise en service"
 
@@ -19646,6 +19633,9 @@ msgstr "Biogazole"
 msgid "Octane 80"
 msgstr "Indice d’octane de 80"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "Indice d’octane de 91"
 
@@ -19667,6 +19657,9 @@ msgstr "E10 (mélange à 10% d’éthanol)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (Superéthanol)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GPL (Gaz de Pétrole Liquéfié)"
 
@@ -22328,6 +22321,12 @@ msgstr "Fontaine"
 msgid "Water Well"
 msgstr "Puits à eau"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Phare"
 
@@ -25440,6 +25439,33 @@ msgstr ""
 "Couche d’imagerie pour la cartographie des pistes dans OSM. Mise à jour "
 "quotidienne."
 
+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"
 
@@ -25521,8 +25547,8 @@ msgstr "OSM Inspector : Adresses"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM Inspector : Ligne de côte (UE)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Massif des Prokletije"
+msgid "imagico.de: Prokletije Mountains"
+msgstr "imagico.de: Massif des Prokletije"
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
@@ -25540,9 +25566,8 @@ msgstr ""
 "Rues et batiments fournis par la municipalité de Tirana hébergés par Open "
 "Labs"
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
-msgstr ""
-"imagico.de OSM Images pour la cartographie: Montagnes du Sud Transantartique"
+msgid "imagico.de: Southern Transantarctic Mountains"
+msgstr "imagico.de: Montagnes du Sud Transantartique"
 
 msgid ""
 "Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
@@ -25551,10 +25576,10 @@ msgstr ""
 "En dehors de la couverture Landsat habituelle et donc pas dans LIMA et Bing "
 "/ Mapbox (couleur vraie)"
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
-msgstr "imagico.de OSM images for mapping: Montagnes de Pensacola"
+msgid "imagico.de: Pensacola Mountains"
+msgstr "imagico.de: Montagnes de Pensacola"
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: Elephant Island/Clarence Island"
 msgstr ""
 "Imagico.de Images OSM pour la cartographie: Île des éléphants / île Clarence"
 
@@ -25563,16 +25588,36 @@ msgstr ""
 "Une image assez claire et actualisée pour la mise à jour des bords des "
 "glaciers (couleur vraie)"
 
-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 ""
-"Imagerie imagico.de pour la cartographie OSM: Terre d’Enderby et Terre de "
-"Kemp"
+
+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: Terre d’Enderby et Terre de Kemp"
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 "Images Sentinel-2 de la Terre d’Enderby et de la Terre de Kemp (couleurs "
 "réelles)"
 
+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 "Carte topographique IGN (TMS)"
 
@@ -25711,16 +25756,14 @@ msgstr "Ministère de l’Agro-industrie (WMS)"
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr "Ministère de l’Énergie et des Mines (WMS)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
-msgstr ""
-"Imagerie imagico.de pour la cartographie OSM: Bahía Blanca (marée basse)"
+msgid "imagico.de: Bahía Blanca (low tide)"
+msgstr "imagico.de: Bahía Blanca (marée basse)"
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr "Estrans et iles de la cote (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
-msgstr ""
-"Imagerie imagico.de pour la cartographie OSM: Bahía Blanca (marée haute)"
+msgid "imagico.de: Bahía Blanca (high tide)"
+msgstr "imagico.de: Bahía Blanca (marée haute)"
 
 msgid "AGRI black-and-white 2.5m"
 msgstr "AGRI noir et blanc 2.5 m"
@@ -25752,7 +25795,7 @@ msgstr "LPI NSW Limites administratives State Forest"
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW Limite administrative réserve NPWS"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: Northwest Heard Island"
 msgstr "Imagico.de OSM images pour la cartographie: Île Heard du nord-ouest"
 
 msgid ""
@@ -25761,7 +25804,7 @@ msgstr ""
 "Les glaciers du nord-ouest de l’île Heard (cartographiés il y a longtemps) "
 "(fausse couleur IR)"
 
-msgid "imagico.de OSM images for mapping: Heard Island coast"
+msgid "imagico.de: Heard Island coast"
 msgstr "Imagico.de OSM images pour la cartographie: côte de l’île ’Heard"
 
 msgid ""
@@ -25831,9 +25874,8 @@ msgstr "VoGIS : Plan de zonage"
 msgid "VoGIS: Höhen und Gelände"
 msgstr "VoGIS: Hauteurs et terrain"
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
-msgstr ""
-"imagico.de OSM Images pour la cartographie:  les montagnes Rila et Pirin"
+msgid "imagico.de: Rila and Pirin Mountains"
+msgstr "imagico.de:  les montagnes Rila et Pirin"
 
 msgid "OpenStreetMap (Belgian Style)"
 msgstr "OpenStreetMap (style belge)"
@@ -25896,7 +25938,7 @@ msgid "SPW(allonie) most recent aerial imagery"
 msgstr "Imagerie aérienne SPW(allonie) images les plus récentes"
 
 msgid "SPW(allonie) 2016 aerial imagery"
-msgstr "SPW(allonie) Imagerie aérienne 2016"
+msgstr "Imagerie aérienne SPW(allonie) 2016"
 
 msgid "SPW(allonie) 2015 aerial imagery"
 msgstr "Imagerie aérienne SPW(allonie) 2015"
@@ -25919,16 +25961,16 @@ msgstr "Arrêts du réseau TEC (peu précis)"
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "Benin : Cotonou Pleiade 2016"
 
-msgid "imagico.de OSM images for mapping: Cotonou"
-msgstr "imagico.de OSM Images pour la cartographie: Cotonou"
+msgid "imagico.de: Cotonou"
+msgstr "imagico.de: Cotonou"
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 "Couverture partielle et partiellement nuageuse dans les sources habituelles "
 "(couleur vraie)"
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
-msgstr "imagico.de OSM Images pour la cartographie: île Bouvet"
+msgid "imagico.de: Bouvet Island"
+msgstr "imagico.de: île Bouvet"
 
 msgid "For more accurate coastline and glacier mapping (true color)"
 msgstr ""
@@ -26102,16 +26144,14 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr "Surcouche Routes Kelowna"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
-msgstr ""
-"imagico.de imagerie pour la cartographie OSM: côte Est de l''Île Devon"
+msgid "imagico.de: Eastern Devon Island coast"
+msgstr "imagico.de: côte Est de l''Île Devon"
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr "Le littoral est principalement mappé entre-temps (fausse couleur IR)"
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
-msgstr ""
-"imagico.de imagerie pour la cartographie OSM: Nord de l’Île d’Ellesmere"
+msgid "imagico.de: Northern Ellesmere Island"
+msgstr "imagico.de: Nord de l’Île d’Ellesmere"
 
 msgid ""
 "Assembled from July 2012 ASTER imagery (true color with estimated blue)"
@@ -26119,11 +26159,8 @@ msgstr ""
 "Assemblé à partir de l imagerie ASTER Juillet 2012 (vraie couleurs avec bleu "
 "estimé)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
-msgstr ""
-"imagico.de imagerie pour la cartographie OSM: Nord de l’Île d’Ellesmere "
-"Juillet 2016"
+msgid "imagico.de: Northern Ellesmere Island July 2016"
+msgstr "imagico.de: Nord de l’Île d’Ellesmere Juillet 2016"
 
 msgid ""
 "Assembled from July 2016 ASTER imagery (true color with estimated blue)"
@@ -26131,14 +26168,14 @@ msgstr ""
 "Assemblé a partir de l imagerie ASTER Juillet 2016 (vraies couleurs avec "
 "bleu estimé)"
 
-msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Fogo, Cap-Vert"
+msgid "imagico.de: Fogo, Cape Verde"
+msgstr "imagico.de: Fogo, Cap-Vert"
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr "Image postérieure à l’éruption de 2014/2015 (couleurs réelles)"
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Île Londonderry"
+msgid "imagico.de: Isla Londonderry"
+msgstr "imagico.de: Île Londonderry"
 
 msgid ""
 "A lot of very coarse coastlines could be improved here, much snow cover "
@@ -26148,8 +26185,8 @@ msgstr ""
 "améliorées, couverture neigeuse importante donc ne pas utiliser pour "
 "cartographier les glaciers (fausses couleurs infrarouges)"
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
-msgstr "Imagerie imagico.de pour la cartographie OSM: volcan Calbuco"
+msgid "imagico.de: Volcán Calbuco"
+msgstr "imagico.de: volcan Calbuco"
 
 msgid "Image from after the 2015 eruption (true color)"
 msgstr "Image postérieure à l’éruption de 2015 (couleurs réelles)"
@@ -26196,8 +26233,8 @@ msgstr "Stevns"
 msgid "Vejmidte"
 msgstr "Vejmidte"
 
-msgid "imagico.de OSM images for mapping: El Altar"
-msgstr "Imagerie imagico.de pour la cartographie OSM: El Altar"
+msgid "imagico.de: El Altar"
+msgstr "imagico.de: El Altar"
 
 msgid ""
 "2007 ASTER image offering better glacier coverage than common sources (true "
@@ -26206,9 +26243,8 @@ msgstr ""
 "Imagerie ASTER 2007 offrant une meilleur couverture des glaciers que les "
 "sources habituelles (vraies couleurs avec bleu estimé)"
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
-msgstr ""
-"Imagerie imagico.de pour la cartographie OSM: îles Darwin et Wolf, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
+msgstr "imagico.de: îles Darwin et Wolf, Galapagos"
 
 msgid ""
 "Recent image, only old and poor images in other sources currently (true "
@@ -26382,11 +26418,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 ""
-"Images OSM imagico.de pour la cartographie: Estrans de la cote Ouest d "
-"Allemagne du Nord"
+msgid "imagico.de: Northern German west coast tidalflats"
+msgstr "imagico.de: Estrans de la cote Ouest d Allemagne du Nord"
 
 msgid ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
@@ -26395,12 +26428,9 @@ msgstr ""
 "Imagerie de marée basse a jour pour mettre a jour la cartographie des "
 "estrans et des haut-fonds (vraies couleurs)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
-"Images OSM de imagico.de pour la cartographie: estrans de la côte ouest d "
-"Allemagne du nord (infrarouge)"
+"imagico.de: estrans de la côte ouest d Allemagne du nord (infrarouge)"
 
 msgid ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
@@ -26409,13 +26439,11 @@ msgstr ""
 "Imagerie a jour de la cote a marée basse pour mettre a jour la cartographie "
 "des estrans et hauts-fonds (fausses couleurs infrarouges)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr ""
-"Images OSM de imagico.de pour la cartographie: Côte de la Mer du Nord 2016"
+msgid "imagico.de: North Sea Coast 2016"
+msgstr "imagico.de: Côte de la Mer du Nord 2016"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
-msgstr ""
-"Images OSM de imagico.de pour la cartographie: Côte de la Mer du Nord 2017"
+msgid "imagico.de: North Sea Coast 2017"
+msgstr "imagico.de: Côte de la Mer du Nord 2017"
 
 msgid "Saxony latest aerial imagery"
 msgstr "Dernière image aérienne de la Saxe"
@@ -26447,21 +26475,20 @@ msgstr "Dernière imagerie aérienne de Mayence"
 msgid "Munich latest aerial imagery 60cm"
 msgstr "Munich: dernière image aérienne 60 cm"
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
+msgstr "imagico.de: Qasigiannguit"
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr "Icebridge DMS image de la colonie - l alignement peut être faible"
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
-msgstr "Imagerie imagico.de pour la cartographie OSM: base aérienne de Thulé"
+msgid "imagico.de: Thule Air Base"
+msgstr "imagico.de: base aérienne de Thulé"
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr "Icebridge DSM image - l alignement peut être faible"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
-msgstr ""
-"Imagerie OSM de imagico.de pour la cartographie: Kangerlussuaq Automne"
+msgid "imagico.de: Kangerlussuaq Autumn"
+msgstr "imagico.de: Kangerlussuaq Automne"
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
@@ -26469,9 +26496,8 @@ msgstr ""
 "Icebridge DSM image de la colonie et de l aéroport - l alignement peut être "
 "faible"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
-msgstr ""
-"Imagerie OSM de imagico.de pour la cartographie: Kangerlussuaq Printemps"
+msgid "imagico.de: Kangerlussuaq Spring"
+msgstr "imagico.de: Kangerlussuaq Printemps"
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
@@ -26479,12 +26505,9 @@ msgstr ""
 "Icebridge DSM imagerie de l aéroport et des routes - l alignement peut être "
 "faible"
 
-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 ""
-"Imagerie OSM de imagico.de pour la cartographie: DMS base aérienne de "
-"Thule,survol a basse altitude Septembre 2015"
+"imagico.de: DMS base aérienne de Thule,survol a basse altitude Septembre 2015"
 
 msgid ""
 "Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
@@ -26492,28 +26515,20 @@ msgstr ""
 "Icebridge DSM imagerie de la base aėrienne de Thule - l alignement peut être "
 "faible"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
-"2015"
-msgstr ""
-"Images OSM de imagico.de pour la cartographie: Base aérienne de Thule, "
-"survol Septembre 2015"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
+msgstr "imagico.de: Base aérienne de Thule, survol Septembre 2015"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
-msgstr ""
-"Images OSM de imagico.de pour la cartographie: base aérienne de Thule, "
-"survol Octobre 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
+msgstr "imagico.de: base aérienne de Thule, survol Octobre 2015"
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
-msgstr "Images OSM de imagico.de pour la cartographie: mosaïque du Groenland"
+msgid "imagico.de: Greenland mosaic"
+msgstr "imagico.de: mosaïque du Groenland"
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr "Mosaïque Landsat du Groenland (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
-msgstr ""
-"Images OSM de imagico.de pour la cartographie: mai 2013 off-nadir Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
+msgstr "imagico.de: mai 2013 off-nadir Landsat"
 
 msgid ""
 "First available image north of the regular Landsat limit, mostly with "
@@ -26523,17 +26538,15 @@ msgstr ""
 "principalemeny avec la couverture neigeuse saisonnière dobc difficile a "
 "interpréter (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
-msgstr ""
-"Images OSM de imagico.de pour la cartographie: Landsat off-nadir Juillet 2016"
+msgid "imagico.de: Landsat off-nadir July 2016"
+msgstr "imagico.de: Landsat off-nadir Juillet 2016"
 
 msgid "Latest images north of the regular Landsat limit (true color)"
 msgstr ""
 "Dernières images au nord de la limite standard de Landsat (vraie couleur)"
 
-msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
-msgstr ""
-"Imagerie OSM de imagico.de pour la cartographie: Nord Groenland ASTER"
+msgid "imagico.de: Northern Greenland ASTER"
+msgstr "imagico.de: Nord Groenland ASTER"
 
 msgid ""
 "Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
@@ -26602,14 +26615,14 @@ msgstr "OpenStreetMap Hongrie (chemins de randonnée)"
 msgid "Hillshade Hungary"
 msgstr "Ombrage Hongrie"
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Est de l’Islande"
+msgid "imagico.de: Eastern Iceland"
+msgstr "imagico.de: Est de l’Islande"
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr "Ilôts manquant et côte inexacte/imprécise (vraie couleur)"
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Rann de Kutch"
+msgid "imagico.de: Rann of Kutch"
+msgstr "imagico.de: Rann de Kutch"
 
 msgid ""
 "Land/water distinction difficult to properly map based on Bing/Mapbox images "
@@ -26618,9 +26631,8 @@ msgstr ""
 "Distinction Terre/Eau difficile pour cartogrophier correctement sur les "
 "images Bing/Mapbox (fausses couleurs infrarouge)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
-msgstr ""
-"Imagerie imagico.de pour la cartographie OSM: Chaîne de Sudirman 2015"
+msgid "imagico.de: Sudirman Range 2015"
+msgstr "imagico.de: Chaîne de Sudirman 2015"
 
 msgid ""
 "Older image of the Sudirman Range with no fresh snow showing glacier extent "
@@ -26629,8 +26641,8 @@ msgstr ""
 "Plus anciennes images de la chaîne du Sudirman sans neige fraiche montrant l "
 "étendue des glaciers (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
-msgstr "Images OSM de imagico.de pour la cartographie: Sud Est de Célèbes"
+msgid "imagico.de: Southeastern Sulawesi"
+msgstr "imagico.de: Sud Est de Célèbes"
 
 msgid ""
 "Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
@@ -26640,21 +26652,20 @@ msgstr ""
 "dans Bing, les lacs pourraient aussi utiliser des détails additionnels "
 "(vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Barrage de Bakun"
+msgid "imagico.de: Bakun Reservoir"
+msgstr "imagico.de: Barrage de Bakun"
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr "Manquant dans les anciennes images pre 2011 (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Batam"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Batam"
+msgid "imagico.de: Batam"
+msgstr "imagico.de: Batam"
 
 msgid "Missing Islands in OSM (true color)"
 msgstr "Iles manquantes dans OSM (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
-msgstr ""
-"Images OSM de imagico.de pour la cartographie: Chaîne du Sudirman 2016"
+msgid "imagico.de: Sudirman Range 2016"
+msgstr "imagico.de: Chaîne du Sudirman 2016"
 
 msgid ""
 "Cloud free image of the Sudirman Range but with fresh snow (true color)"
@@ -26762,16 +26773,14 @@ msgstr "Imagerie ortho du Japon GSI"
 msgid "Japan GSI Standard Map"
 msgstr "Carte standard GSI du Japon"
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
-msgstr ""
-"Images OSM de imagico.de pour la cartographie: Mer d Aral (niveau d eau bas)"
+msgid "imagico.de: Aral Sea (low water level)"
+msgstr "imagico.de: Mer d Aral (niveau d eau bas)"
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr "Eau et zones humides,barrages etc (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
-msgstr ""
-"Images OSM de imagico.de pour la cartographie: Mer d Aral (haut niveau d eau)"
+msgid "imagico.de: Aral Sea (high water level)"
+msgstr "imagico.de: Mer d Aral (haut niveau d eau)"
 
 msgid ""
 "Water and wetland extents, dams etc. - some remaining winter ice in the "
@@ -26780,8 +26789,8 @@ msgstr ""
 "Etendues d eau et zones humides,barrages etc - quelques glaces d hiver "
 "persistentes dans le nord (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Mont Kenya 2016"
+msgid "imagico.de: Mount Kenya 2016"
+msgstr "imagico.de: Mont Kenya 2016"
 
 msgid "Up-to-date image for glacier mapping (true color)"
 msgstr "Images a jour pour la cartographie des glaciers (vraies couleurs)"
@@ -26876,13 +26885,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr "MTBmap.no"
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -26972,6 +26974,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 ""
 
@@ -26980,6 +26996,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 "MTBmap.no"
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -26987,14 +27027,14 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
-msgstr "Images OSM de imagico.de pour la cartographie: mosaïque de Svalbard"
+msgid "imagico.de: Svalbard mosaic"
+msgstr "imagico.de: mosaïque de Svalbard"
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr "Sentinel-2 mosaïque de Svalbard (vraie couleur)"
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
-msgstr "Images OSM de imagico.de pour la cartographie: Ouest de Karakoram"
+msgid "imagico.de: Western Karakoram"
+msgstr "imagico.de: Ouest de Karakoram"
 
 msgid ""
 "Represents approximately minimum snow cover so can be well used for glacier "
@@ -27009,10 +27049,8 @@ msgstr "Bande de Gaza - Pléiades - 2014/07/06"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Bande de Gaza - Pléiades - 2014/07/06 (NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
-msgstr ""
-"Imagerie imagico.de pour la cartographie OSM: Canal de Panama - côté "
-"Pacifique"
+msgid "imagico.de: Panama Canal - Pacific side"
+msgstr "imagico.de: Canal de Panama - côté Pacifique"
 
 msgid ""
 "New locks with less clouds than in the Sentinel-2 image - make sure to check "
@@ -27021,37 +27059,34 @@ msgstr ""
 "Nouvelles prises avec moins de nuages que dans l imagerie Sentinel-2 - s "
 "assurer de vérifier l alignement de l image (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Canal de Panama"
+msgid "imagico.de: Panama Canal"
+msgstr "imagico.de: Canal de Panama"
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 "Images de nouvelles prises (mais partiellement nuageuses) (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Vanatinai"
+msgid "imagico.de: Vanatinai"
+msgstr "imagico.de: Vanatinai"
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 "Ligne de côte grossière a cause de la couverture nuageuse de Bing/Mapbox "
 "(vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: New Ireland"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Nouvelle-Irlande"
+msgid "imagico.de: New Ireland"
+msgstr "imagico.de: Nouvelle-Irlande"
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 "Beaucoup d îles manquantes dans OSM (la plupart mappées entretemps) (vraies "
 "couleurs)"
 
-msgid "imagico.de OSM images for mapping: Coropuna"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Coropuna"
+msgid "imagico.de: Coropuna"
+msgstr "imagico.de: Coropuna"
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
-msgstr ""
-"Imagerie imagico.de pour la cartographie OSM: Cordillère de Vilcanota et "
-"glacier Quelccaya"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr "imagico.de: Cordillère de Vilcanota et glacier Quelccaya"
 
 msgid "Poor and outdated imagery in other sources (true color)"
 msgstr "Imagerie pauvre et dépassée dans d autres sources (vraies couleurs)"
@@ -27119,8 +27154,11 @@ msgstr "Katowice: Bâtiments"
 msgid "Łódź: Buildings"
 msgstr "Łódź: Bâtiments"
 
-msgid "Łódź: Orthophotomap (aerial image)"
-msgstr "Łódź: Orthophoto (image aérienne)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
+msgstr ""
 
 msgid "Powiat dębicki: Buildings"
 msgstr "Powiat de Dębica: Bâtiment"
@@ -27152,6 +27190,12 @@ msgstr "Powiat de Stalowa Wola: Bâtiments"
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr "Poznań: Orthophoto 2014 (image aérienne)"
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr "Przemyśl: Bâtiments"
 
@@ -27200,40 +27244,34 @@ msgstr "ScanEx IRS"
 msgid "ScanEx SPOT"
 msgstr "ScanEx SPOT"
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Détroit de Kertch"
+msgid "imagico.de: Kerch Strait"
+msgstr "imagico.de: Détroit de Kertch"
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr "Etat de la construction du pont en Aout 2016 (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Côte de Petchora"
+msgid "imagico.de: Pechora Sea Coast"
+msgstr "imagico.de: Côte de Petchora"
 
 msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
 msgstr ""
 "Image Sentinel-2 de la Côte de Petchora en automne 2016 (couleurs réelles)"
 
-msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Île Ouchakov août 2016"
+msgid "imagico.de: Ushakov Island August 2016"
+msgstr "imagico.de: Île Ouchakov août 2016"
 
 msgid "Up-to-date late summer imagery with few clouds (true color)"
 msgstr ""
 "Dernière imagerie d été à jour avec quelques nuages (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Northern Dvina delta at low tide"
-msgstr ""
-"Imagerie imagico.de pour la cartographie OSM: Delta de la Dvina "
-"septentrionale à marée basse"
+msgid "imagico.de: Northern Dvina delta at low tide"
+msgstr "imagico.de: Delta de la Dvina septentrionale à marée basse"
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr "Plages, estrans et autres formes côtières (vraies couleurs)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
-msgstr ""
-"Images OSM de imagico.de pour la cartographie: Nord et montagnes polaires d "
-"Oural Aout 2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
+msgstr "imagico.de: Nord et montagnes polaires d Oural Aout 2016"
 
 msgid ""
 "Up-to-date late summer imagery with few clouds - caution: not all visible "
@@ -27242,8 +27280,8 @@ msgstr ""
 "Dernière imagerie d été a jour avec quelques nuages - attention: toute la "
 "neige visible n est pas des glaciers (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Cosmodrome Vostochny"
+msgid "imagico.de: Vostochny Cosmodrome"
+msgstr "imagico.de: Cosmodrome Vostochny"
 
 msgid "Recent image showing newest features (true color)"
 msgstr "Image récente montrant de nouvelles particularités (vraies couleurs)"
@@ -27294,27 +27332,27 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "Afrique du Sud CD:NGI Aérien"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
-msgstr "Imagerie OSM de imagico.de pour la cartographie: Ile de Leskov ASTER"
+msgid "imagico.de: Leskov Island ASTER"
+msgstr "imagico.de: Ile de Leskov ASTER"
 
 msgid "Missing in other image sources (true color with estimated blue)"
 msgstr ""
 "Manquant dans les autres sources d image (vraies couleurs avec bleu estimé)"
 
-msgid "imagico.de OSM images for mapping: Scott Island"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Île Scott"
+msgid "imagico.de: Scott Island"
+msgstr "imagico.de: Île Scott"
 
 msgid "Missing in other image sources (true color)"
 msgstr "Manquant dans les autres sources d image (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
-msgstr "Images OSM de imagico.de pour la cartographie: Ile Leskov Landsat"
+msgid "imagico.de: Leskov Island Landsat"
+msgstr "imagico.de: Ile Leskov Landsat"
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Clerke Rocks"
+msgid "imagico.de: Clerke Rocks"
+msgstr "imagico.de: Clerke Rocks"
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
+msgstr "imagico.de: Shag Rocks"
 
 msgid "Catastro Spain"
 msgstr "Cadastre de l’Espagne"
@@ -27337,8 +27375,8 @@ msgstr "IDEIB - Îles Baléares"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Îles Canaries"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Pont d’Adam"
+msgid "imagico.de: Adams Bridge"
+msgstr "imagico.de: Pont d’Adam"
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr ""
@@ -27435,10 +27473,8 @@ msgstr "Canton de Bâle-Ville 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 ""
-"Imagerie imagico.de pour la cartographie OSM: Alpes Centrales fin septembre "
-"2016"
 
 msgid ""
 "Up-to-date image for glacier mapping - beware of some fresh snow at higher "
@@ -27447,6 +27483,13 @@ msgstr ""
 "Image a jour pour la cartographie des glaciers - attention a la neige "
 "fraiche en haute altitude (vraies couleurs)"
 
+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 "Taïwan e-Map Données Ouvertes"
 
@@ -27465,8 +27508,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 "Imagerie imagico.de pour la cartographie OSM: Mont Kilimandjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
+msgstr "imagico.de: Mont Kilimandjaro 2016"
 
 msgid "Aşgabat (high resolution)"
 msgstr "Aşgabat (haute résolution)"
@@ -27538,8 +27581,8 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "Service forestier des routes (États-Unis)"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Chaîne d’Alaska"
+msgid "imagico.de: Alaska Range"
+msgstr "imagico.de: Chaîne d’Alaska"
 
 msgid ""
 "Recent summer image of the Alaska Range for mapping natural features (true "
@@ -27548,14 +27591,14 @@ msgstr ""
 "Image d été récente de la chaine d Alaska pour cartographier les "
 "caractéristiques naturelles (vraies couleurs)"
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Île Bogoslof"
+msgid "imagico.de: Bogoslof Island"
+msgstr "imagico.de: Île Bogoslof"
 
 msgid "Recent image from after the eruption (true color)"
 msgstr "Imagerie récente postérieure à l’érution (couleurs réelles)"
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
-msgstr "Imagerie imagico.de pour la cartographie: Golfe de Cook"
+msgid "imagico.de: Cook Inlet"
+msgstr "imagico.de: Golfe de Cook"
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
 msgstr "Estrans et glaciers dans les montagnes alentours (vraies couleurs)"
@@ -27659,8 +27702,15 @@ msgstr ""
 "par pixel ( approximativement 1 pied) couvrant New Castle, Kent et comtés du "
 "Sussex dans le Delaware."
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Monts Rwenzori"
+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: Monts Rwenzori"
 
 msgid ""
 "Recent image of most of the remaining Rwenzori Mountains glaciers (false "
@@ -27669,8 +27719,8 @@ msgstr ""
 "Imagerie récente dela plupart des glaciers restant dans les montagnes de "
 "Rwenzori (fausses couleurs infrarouges)"
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
-msgstr "Imagerie imagico.de pour la cartographie OSM: Monts Rwenzori 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
+msgstr "imagico.de: Monts Rwenzori 2016"
 
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Orthophoto 2012"
@@ -27686,6 +27736,12 @@ msgstr "Ukraine - Kiev 2014 (DZK)"
 msgid "7th Series (OS7)"
 msgstr "7ème Séries (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr "OS New Popular Edition historic"
 
@@ -28877,51 +28933,36 @@ msgstr "{0} doit être un nombre entier entre -5 et 5"
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr "{0} doit être numérique avec des incréments optionnels de 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} : l’unité par défaut est le mètre ; le point sert de séparateur ; s’il y "
-"a des noms  d’unités à ajouter, mettre un espace puis l’abréviation de "
-"l’unité de mesure"
 
 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} : en tonnes par défaut ; le point est le séparateur décimal ; pour "
-"indiquer une unité, insérez un espace puis l’unité"
 
-msgid "unusual {0} format"
-msgstr "Format {0} non usuel"
+msgid "unusual value of {0}"
+msgstr "valeur inhabituelle de {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} : en kilomètres par défaut ; le point est le séparateur décimal ; pour "
-"indiquer une unité, insérez un espace puis l’unité"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr "la tension doit être en Volts sans unité/delimiter/ espace"
 
-msgid "unusual {0} specification"
-msgstr "spécification {0} non usuelle"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr ""
-"Valeur d’écartement des rails inusuelle; utilisez des mm dans séparateur"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr "Mauvaise valeur d’inclinaison, doit être en %/degré ou up/down"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} doit être une valeur numérique"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} doit être un nombre entier positif"
 
-msgid "unusual value of {0}"
-msgstr "valeur inhabituelle de {0}"
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr "{0} doit être une valeur numérique, en mètres et sans unité"
 
@@ -29040,6 +29081,9 @@ msgstr "Cacher les icônes à un faible zoom"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Symboles de nœuds moins encombrants à fort grossissement"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Afficher les étiquettes de rues (à zoom élevé)"
 
@@ -29102,6 +29146,9 @@ msgstr ""
 "Affecte automatiquement l''adresse à un objet sélectionné en Autriche. 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."
@@ -29149,6 +29196,9 @@ msgstr ""
 "Implémente une ligne de commande et permet la création de commandes "
 "personnalisées. Voir le lien pour les commandes standard (arc, circle etc.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr "Outil de fusion de données (correspondance et fusion)."
 
@@ -29205,6 +29255,11 @@ msgstr "Affiche le profil d’élévation et les statistiques d’une trace GPX.
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Gestion des EPCIs (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Utiliser des scripts externes dans JOSM"
 
@@ -29427,6 +29482,9 @@ msgstr ""
 "Permet l’ouverture de fichier GPX/OSM correspondant à la surface "
 "actuellement visible."
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -30322,590 +30380,6 @@ msgstr "Importer une image géoréférencée"
 msgid "Error while creating image layer: "
 msgstr "Une erreur est survenue lors de la création du calque image : "
 
-msgid "Mapillary Images"
-msgstr "Images Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Calque Mapillary"
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr "{0} séquences, chacune contenant entre {1} et {2} images  (ø {3})"
-
-msgid "{0} imported images"
-msgstr "{0} images importées"
-
-msgid "{0} downloaded images"
-msgstr "{0} images téléchargées"
-
-msgid "{0} images in total"
-msgstr "{0} images au total"
-
-msgid "{0} images in {1} sequences"
-msgstr "{0} images dans {1} séquences"
-
-msgid "Mapillary object layer"
-msgstr "Calque d''objets Mapillary"
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr "Affiche le calque montrant les objets détectés par Mapillary"
-
-msgid "Open Mapillary layer"
-msgstr "Ouvrir la couche Mapillary"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Download Mapillary images in current view"
-msgstr "Télécharger des images Mapillary dans la vue actuelle"
-
-msgid "Export pictures"
-msgstr "Exporter des photos"
-
-msgid "Export Mapillary pictures"
-msgstr "Exporter des photos Mapillary"
-
-msgid "Export images"
-msgstr "Exporter des images"
-
-msgid "Import pictures"
-msgstr "Importer des photos"
-
-msgid "Import local pictures"
-msgstr "Importer des photos locales"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Importer des photos dans un calque Mapillary"
-
-msgid "Join mode"
-msgstr "Mode assemblage"
-
-msgid "Join/unjoin pictures"
-msgstr "(Dés)assembler les images"
-
-msgid "Submit changeset"
-msgstr "Soumettez les changements"
-
-msgid "Submit the current changeset"
-msgstr "Soumettez l’ensemble des modifications actuelles"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "Soumettre le groupe de modification courant a Mapillary"
-
-msgid "rejected"
-msgstr "rejeté"
-
-msgid "pending"
-msgstr "en attente"
-
-msgid "approved"
-msgstr "approuvé"
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr "{0} images soumises, Groupe de modification clef: {1}, Etat: {2}"
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr ""
-"Le téléversement du groupe de modification a échoué avec {0} erreurs \"{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 ""
-"Une exception s’est produite lors de la tentative d’envoi des modifications. "
-"Si cela se produit à plusieurs reprises, pensez à signaler un bug via le "
-"menu Aide. Si ce message apparaît pour la première fois, essayez-le à "
-"nouveau. Cela pourrait avoir été un problème avec la connexion Internet."
-
-msgid "Upload Mapillary images"
-msgstr "Téléverser les images mapillary"
-
-msgid "Walk mode"
-msgstr "Mode piéton"
-
-msgid "Zoom to selected image"
-msgstr "Zoomer sur l’image sélectionnée"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Zoomer sur l’image Mapillary actuellement sélectionnée"
-
-msgid "Current Mapillary changeset"
-msgstr "Groupe de modification Mapillary courant"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Ouvrir la boite de dialogue des modifications Mapillary"
-
-msgid "Mapillary changeset"
-msgstr "Modifications Mapillary"
-
-msgid "Submitting changeset to server…"
-msgstr "Envoyer les modifications au serveur ..."
-
-msgid "Export all images"
-msgstr "Exporter toutes les images"
-
-msgid "Export selected sequence"
-msgstr "Exporter la séquence sélectionnée"
-
-msgid "Export selected images"
-msgstr "Exporter les images sélectionnées"
-
-msgid "Rewrite imported images"
-msgstr "Réécrire les images importées"
-
-msgid "Select a directory"
-msgstr "Sélectionner un répertoire"
-
-msgid "Explore"
-msgstr "Explorer"
-
-msgid "Speed limit"
-msgstr "Limite de vitesse"
-
-msgid "Give way"
-msgstr "Cédez-le-passage"
-
-msgid "No entry"
-msgstr "Aucune entrée"
-
-msgid "Intersection danger"
-msgstr "Danger à l''intersection"
-
-msgid "Mandatory direction (any)"
-msgstr "Prescription de sens (n''importe lequel)"
-
-msgid "Uneven road"
-msgstr "Route déformée"
-
-msgid "No parking"
-msgstr "Stationnement interdit"
-
-msgid "No overtaking"
-msgstr "Interdiction de dépasser"
-
-msgid "Pedestrian crossing"
-msgstr "Passage piéton"
-
-msgid "No turn"
-msgstr "Changement de direction interdit"
-
-msgid "Years"
-msgstr "Années"
-
-msgid "Months"
-msgstr "Mois"
-
-msgid "Days"
-msgstr "Jours"
-
-msgid "Imported images"
-msgstr "Images importées"
-
-msgid "Mapillary filter"
-msgstr "Filtre Mapillary"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Ouvrir le dialogue du filtre Mapillary"
-
-msgid "Not older than: "
-msgstr "Pas plus vieux que : "
-
-msgid "Downloaded images"
-msgstr "Photos téléchargées"
-
-msgid "Only images with signs"
-msgstr "Seulement les images avec panneaux"
-
-msgid "Choose signs"
-msgstr "Choisir les panneaux"
-
-msgid "Mapillary history"
-msgstr "Historique de Mapillary"
-
-msgid "Open Mapillary history dialog"
-msgstr "Ouvrir la fenêtre d''historique de Mapillary"
-
-msgid "No image selected"
-msgstr "Pas d''image sélectionnée"
-
-msgid "Press \"{0}\" to download images"
-msgstr "Appuyez sur \"{0}\" pour télécharger des images"
-
-msgid "Mapillary picture"
-msgstr "Image Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Ouvrir la fenêtre Mapillary"
-
-msgid "Next picture"
-msgstr "Photo suivante"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Voir la photo suivante"
-
-msgid "Previous picture"
-msgstr "Photo précédente"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Voir la photo précédente"
-
-msgid "Jump to red"
-msgstr "Aller en rouge"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Passer à l’image de l’autre côté de la ligne rouge"
-
-msgid "Jump to blue"
-msgstr "Aller en bleu"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Passer à l’image de l’autre côté de la ligne bleue"
-
-msgid "Stops the walk."
-msgstr "Arrête la marche."
-
-msgid "Play"
-msgstr "Lecture"
-
-msgid "Continues with the paused walk."
-msgstr "Continue la marche arrêtée."
-
-msgid "Pause"
-msgstr "Pause"
-
-msgid "Pauses the walk."
-msgstr "Suspend la marche."
-
-msgid "Display hour when the picture was taken"
-msgstr "Afficher l''heure de la prise de vue"
-
-msgid "Use 24 hour format"
-msgstr "Utiliser le système horaire sur 24 heures"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-"Centrer la vue sur la localisation de la photo avec les boutons "
-"suivante/précédente"
-
-msgid "Preview images when hovering its icon"
-msgstr "Aperçu des images lors du survol de l’icône"
-
-msgid "Cut off sequences at download bounds"
-msgstr "Couper les séquences aux limites de téléchargement"
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-"A l’ouverture d’une image dans le navigateur, ouvrir l’éditeur de floutage "
-"au lieu du visualiseur d’images"
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr ""
-"Activer les beta-fonctionnalités expérimentales (peuvent être instables)"
-
-msgid "Download mode"
-msgstr "Mode téléchargement"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr "Nombre d images a pré-charger (vers l avant, vers l arrière)"
-
-msgid "You are logged in as ''{0}''."
-msgstr "Vous êtes connecté en tant que ''{0}''."
-
-msgid "You are currently not logged in."
-msgstr "Vous n''êtes pas identifié."
-
-msgid "Login"
-msgstr "Connexion"
-
-msgid "Logout"
-msgstr "Déconnexion"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-"Ouvrez les paramètres et connectez-vous à Mapillary avant de réaliser un "
-"upload."
-
-msgid "Upload selected sequence"
-msgstr "Envoyer la séquence sélectionnée"
-
-msgid "Delete after upload"
-msgstr "Effacer après l’envoi"
-
-msgid "Wait for full quality pictures"
-msgstr "Attendre les images en pleine résolution"
-
-msgid "Follow selected image"
-msgstr "Suivre l''image sélectionnée"
-
-msgid "Go forward"
-msgstr "Avancer"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-"Quelles couches d''image souhaitez-vous importer dans la couche Mapillary?"
-
-msgid "Import"
-msgstr "Importer"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-"On ne peut pas importer une image géotagguée dans la couche Mapillary!"
-
-msgid "{0} ({1} images)"
-msgstr "{0} ({1} images)"
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-"De quelle source souhaitez-vous importer des images vers la couche Mapillary?"
-
-msgid "There are currently no layers with geotagged images!"
-msgstr "Il n''y a actuellement aucun calque avec des images géoréférencées!"
-
-msgid "Images from my file system"
-msgstr "Images provenant de mon système de fichiers"
-
-msgid "Select the images you want to import"
-msgstr "Sélectionnez les images que vous souhaitez importer"
-
-msgid "All images in a directory"
-msgstr "Toutes les images dans un répertoire"
-
-msgid "Select directory to import images from"
-msgstr "Sélectionnez le répertoire pour importer des images de"
-
-msgid "From existing image layer"
-msgstr "À partir de couche d image existante"
-
-msgid "Import exception"
-msgstr "Exception d import"
-
-msgid "Could not import the image ''{0}''!"
-msgstr "Impossible d’importer l’image ''{0}''!"
-
-msgid "Could not import the directory ''{0}''!"
-msgstr "Impossible d importer le répertoire \"{0}\"!"
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-"Un tag avec la clé <i> {0} </ i> est déjà présent sur l''objet OSM "
-"sélectionné."
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-"Voulez-vous vraiment remplacer la valeur actuelle <i>{0}</ i> par la "
-"nouvelle valeur <i>{1}</ i>?"
-
-msgid "Tag conflict"
-msgstr "Tag en conflit"
-
-msgid "Key copied to clipboard"
-msgstr "Copier dans le Presse-papier"
-
-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 ""
-"Le plugin Mapillary utilise maintenant un panneau séparé pour afficher des "
-"informations supplémentaires (comme la clé d''image) et les actions pour "
-"l''image Mapillary sélectionnée (comme l''afficher dans un navigateur)."
-
-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 ""
-"Il peut être activé en cliquant sur le bouton gauche en bas de ce message ou "
-"sur le bouton dans la barre d''outils à gauche, qui utilise la même icône."
-
-msgid "I got it, close this."
-msgstr "J’ai compris. Fermez cela."
-
-msgid "Image info"
-msgstr "Informations de l image"
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-"Affiche des informations détaillées sur l’image Mapillary actuellement "
-"sélectionnée"
-
-msgid "Show detections on top of image"
-msgstr "Montre les détections en haut de l image"
-
-msgid "View in browser"
-msgstr "Voir dans le navigateur"
-
-msgid "Copy key"
-msgstr "Copier la clé"
-
-msgid "Add Mapillary tag"
-msgstr "Ajouter un tag Mapillary"
-
-msgid "Image detections"
-msgstr "Détections d image"
-
-msgid "Image actions"
-msgstr "Actions sur l’image"
-
-msgid "Image key"
-msgstr "Clé de l’image"
-
-msgid "Sequence key"
-msgstr "Clé de la séquence"
-
-msgid "{0} detections"
-msgstr "{0} détections"
-
-msgid "image has no key"
-msgstr "L,’image n’a pas de clé"
-
-msgid "unknown user"
-msgstr "Utilisateur inconnu"
-
-msgid "sequence has no key"
-msgstr "La séquence n’a pas de clé"
-
-msgid "Could not open the URL {0} in a browser"
-msgstr "Impossible d ouvrir l URL {0} dans un navigateur"
-
-msgid "Downloading map objects…"
-msgstr "Téléchargement des objets de la carte…"
-
-msgid "All map objects loaded."
-msgstr "Tous les objets  sont téléchargés."
-
-msgid "Too many map objects, zoom in to see all."
-msgstr "Tous les objets ne peuvent être affichés, zoomez pour voir tout."
-
-msgid "Downloading map objects failed!"
-msgstr "Le téléchargement des objets a échoué!"
-
-msgid "Mapillary objects"
-msgstr "Objets Mapillary"
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-"Affiche les objets détectés par Mapillary à partir de leur image de vue de "
-"rue"
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] "{0} photo effacée"
-msgstr[1] "{0} photos effacées"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "{0} image importée"
-msgstr[1] "{0} images importées"
-
-msgid "2 images joined"
-msgstr "2 images assemblées"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "{0} image déplacée"
-msgstr[1] "{0} images déplacées"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "{0} image tournée"
-msgstr[1] "{0} images tournées"
-
-msgid "2 images unjoined"
-msgstr "2 images désassemblées"
-
-msgid "Could not read from URL {0}!"
-msgstr "Impossible de lire depuis l URL {0}!"
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-"{0}\n"
-"Impossible de lire les objets de la carte depuis l URL\n"
-"{1}!"
-
-msgid "everything in the visible area"
-msgstr "Tout est dans la zone visible"
-
-msgid "areas with downloaded OSM-data"
-msgstr "Zones avec données OSM téléchargées"
-
-msgid "only when manually requested"
-msgstr "Uniquement lorsque demandé manuellement"
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-"Le calque Mapillary a arrêté de télécharger les images parce que la zone "
-"demandée est trop grande!"
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-"Pour résoudre ce problème, vous pouvez zoomer et charger une zone plus "
-"restreinte de la carte."
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-"Pour résoudre ce problème, vous pouvez passer sur le mode de téléchargement "
-"\"{0}\" et charger les images Mapillary pour une zone de la carte plus "
-"restreinte."
-
-msgid "Downloading"
-msgstr "Téléchargement en cours"
-
-msgid "Select mode"
-msgstr "Choisir un mode"
-
-msgid "Mapillary login"
-msgstr "Connexion à Mapillary"
-
-msgid "Login successful, return to JOSM."
-msgstr "Connexion réussie, retour à JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Formats d''image supportés (JPG et PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "Téléchargement des photos Mapillary en cours"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Nombre total de photos : {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr "Groupe de modification Mpaillary en cours d envoi"
-
-msgid "No images found"
-msgstr "Aucune image trouvée"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr "Vous avez chargé avec succès {0} images sur mapillary.com"
-
-msgid "Finished upload"
-msgstr "Envoi terminé"
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-"Vous n êtes pas connecté, connectez vous a Mapillary dans les préférences"
-
-msgid "Not Logged in to Mapillary"
-msgstr "Non connecté a Mapillary"
-
-msgid "Uploading: {0}"
-msgstr "Envoi en cours : {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -31747,6 +31221,115 @@ msgstr "Aucune adresse n’a été trouvée pour cet objet."
 msgid "An unexpected exception occurred:"
 msgstr "Une erreur inattendue s’est produite:"
 
+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 ""
+"Cet outil peut seulement remplacer un nœud, promouvoir un nœud en chemin ou "
+"en multipolygone, ou remplacer un chemin par un autre chemin."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr ""
+"Le nœud appartient à un ou plusieurs chemin(s), impossible de le remplacer."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+"La relation n’est pas un multipolygone, impossible de l‘utiliser en "
+"remplacement."
+
+msgid "Replace geometry for node {0}"
+msgstr "Remplacer la géométrie du nœud {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Veuillez sélectionner un chemin existant dans la base de données et un "
+"nouveau chemin de géométrie correcte."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "Les chemins doivent être entièrement dans la zone téléchargée."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"Le chemin à remplacer ne peut pas avoir de nœuds ayant des propriétés ou des "
+"appartenances à une relation à moins qu’’ils appartiennent aux deux chemins."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"Limite d’itérations de la méthode robuste atteinte, utilisation de la "
+"méthode simple"
+
+msgid "Replace geometry for way {0}"
+msgstr "Remplacer la géométrie du chemin {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Trop de chemins sont ajoutés: {0} !"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr "Généralisation de batiment"
 
@@ -31783,9 +31366,30 @@ msgstr "Attributs des bâtiments :"
 msgid "Cannot place building outside of the world."
 msgstr "Impossible de construire un bâtiment en dehors du monde."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Créer un bâtiment"
 
+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 "Définir la grandeur des bâtiments"
 
@@ -31798,8 +31402,17 @@ msgstr "Sélectionner automatiquement le bâtiment"
 msgid "Use address nodes under buildings"
 msgstr "Utiliser des nœuds d’adresse sous les bâtiments"
 
-msgid "Buildings width:"
-msgstr "Largeur des bâtiments :"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Longueur de l’escalier :"
@@ -32567,6 +32180,18 @@ msgstr "Supprimer le jeu sélectionné de la liste"
 msgid "Color Schemes"
 msgstr "Jeux de couleurs"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Annuler les modification et fermer la fenêtre"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Appliquer les modification et fermer la fenêtre"
+
 msgid "Conflation"
 msgstr "Conflation"
 
@@ -33096,6 +32721,9 @@ msgstr "Ouverture du contrôle GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Zoome + pour voir les messages"
 
+msgid "Login"
+msgstr "Connexion"
+
 msgid "Enable autologin"
 msgstr "Activer la connexion automatique"
 
@@ -33128,24 +32756,15 @@ msgstr "Chat privé"
 msgid "Close tab"
 msgstr "Fermer l''onglet"
 
+msgid "Logout"
+msgstr "Déconnexion"
+
 msgid "Clear log"
 msgstr "Effacer le journal"
 
 msgid "Show users on map"
 msgstr "Afficher les utilisateurs sur la carte"
 
-msgid "GeoJSON file"
-msgstr "Fichier GeoJSON"
-
-msgid "Loading json file..."
-msgstr "Chargement du fichier json..."
-
-msgid "Data Layer from GeoJSON: "
-msgstr "Couche de données GeoJSON: "
-
-msgid "Error loading geojson file {0}"
-msgstr "Erreur lors du chargement du fichier geojson {0}"
-
 msgid "Position only"
 msgstr "Seulement la position"
 
@@ -33240,6 +32859,9 @@ msgstr ""
 "Importer les données depuis le traceur GPS Globalsat DG100 dans le calque "
 "GPX."
 
+msgid "Import"
+msgstr "Importer"
+
 msgid "GPS Blams"
 msgstr "GPS Blams"
 
@@ -33999,8 +33621,26 @@ msgstr "Type de structure"
 msgid "Offset into background:"
 msgstr "Compensation dans l arrière plan"
 
-msgid "Indoor Mapping Helper"
-msgstr "Assistant de cartographie en intérieur"
+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 "Activer"
@@ -34032,36 +33672,94 @@ msgstr "Définit le tag de référence lorsque l’objet-pièce est sélectionn
 msgid "Apply Tags"
 msgstr "Appliquer le tag"
 
-msgid "Fitting"
-msgstr "Ajustement"
+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>Pensez à commencer à ajuster  votre plan de batiment dès "
-"maintenant.<br> Pour celà utilisez le greffon PicLayer, que vous pouvez "
-"installer<br> en utilisant le gestionnaire de greffon de JOSM.</html>"
-
-msgid "Level Selection"
-msgstr "Sélection du niveau"
 
-msgid "Lowest Level"
-msgstr "Le plus bas niveau"
-
-msgid "The lowest level of your building."
-msgstr "Le plus bas niveau du bâtiment"
+msgid "level number:"
+msgstr ""
 
-msgid "Highest Level"
-msgstr "Le plus haut niveau"
+msgid "Example: ''2'' or ''3''"
+msgstr ""
 
-msgid "The highest level of your building."
-msgstr "Le plus haut niveau du bâtiment"
+msgid "Indoor Mapping Helper"
+msgstr "Assistant de cartographie en intérieur"
 
 msgid "Toolbox for indoor mapping assistance"
 msgstr "Boîte à outils pour l’assistance cartographique intérieure"
 
+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 "ModeInfo"
 
@@ -35247,6 +34945,27 @@ msgstr "Extension de fichier inconnue : {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "L’analyse du fichier ’’{0}’’ a échoué"
 
+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"
 
@@ -35588,6 +35307,9 @@ msgstr "Éditer les données GPS de la photo"
 msgid "Please select an image first."
 msgstr "Veuillez sélectionner une image d''abord."
 
+msgid "No image selected"
+msgstr "Pas d''image sélectionnée"
+
 msgid "(Empty values delete the according fields.)"
 msgstr "(Les valeurs vides suppriment les champs correspondants.)"
 
@@ -36367,6 +36089,9 @@ msgstr "implicite"
 msgid "State"
 msgstr "Département"
 
+msgid "pending"
+msgstr "en attente"
+
 msgid "[incomplete]"
 msgstr "[incomplet]"
 
@@ -36797,12 +36522,6 @@ msgstr "Nouvelle valeur pour {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr "Préférence ''{0}'' manquante. Impossible d''initialiser SdsApi."
 
-msgid "Failed to open connection to API {0}."
-msgstr "La connexion à l’API {0} a échoué."
-
-msgid "Proxy Authentication Required"
-msgstr "Authentification par proxy exigée"
-
 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>"
@@ -37173,12 +36892,6 @@ msgstr "Greffon d’édition des attributs JOSM"
 msgid "Presets"
 msgstr "Attributs"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Annuler les modification et fermer la fenêtre"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Appliquer les modification et fermer la fenêtre"
-
 msgid "Highlight"
 msgstr "Surligner"
 
@@ -38962,50 +38675,6 @@ msgstr ""
 "Cet outil remplace la géométrie d’un objet par une autre et demande donc "
 "qu’exactement deux objets soient sélectionnés."
 
-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 ""
-"Cet outil peut seulement remplacer un nœud, promouvoir un nœud en chemin ou "
-"en multipolygone, ou remplacer un chemin par un autre chemin."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr ""
-"Le nœud appartient à un ou plusieurs chemin(s), impossible de le remplacer."
-
-msgid "Replace geometry for node {0}"
-msgstr "Remplacer la géométrie du nœud {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-"La relation n’est pas un multipolygone, impossible de l‘utiliser en "
-"remplacement."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Veuillez sélectionner un chemin existant dans la base de données et un "
-"nouveau chemin de géométrie correcte."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "Les chemins doivent être entièrement dans la zone téléchargée."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"Le chemin à remplacer ne peut pas avoir de nœuds ayant des propriétés ou des "
-"appartenances à une relation à moins qu’’ils appartiennent aux deux chemins."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"Limite d’itérations de la méthode robuste atteinte, utilisation de la "
-"méthode simple"
-
-msgid "Replace geometry for way {0}"
-msgstr "Remplacer la géométrie du chemin {0}"
-
 msgid "Replace Membership"
 msgstr "Remplacer les membres"
 
@@ -39085,9 +38754,6 @@ msgstr "Sélectionner les nœuds du milieu"
 msgid "Please select two nodes connected by way!"
 msgstr "Veuillez sélectionner deux nœuds connectés par un chemin !"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Trop de chemins sont ajoutés: {0} !"
-
 msgid "All inside [testing]"
 msgstr "Tout l’intérieur [en test]"
 
diff --git a/i18n/po/ga.po b/i18n/po/ga.po
index d1797c6..b26403b 100644
--- a/i18n/po/ga.po
+++ b/i18n/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2015-05-17 11:43+0000\n"
 "Last-Translator: Thorsten <Unknown>\n"
 "Language-Team: Irish <ga at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:44+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:44+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/gl.po b/i18n/po/gl.po
index 385e212..4571a33 100644
--- a/i18n/po/gl.po
+++ b/i18n/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2017-11-23 00:05+0000\n"
 "Last-Translator: Jesús López <Unknown>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:45+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:45+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: gl\n"
 "X-Poedit-Language: Galician\n"
 
@@ -1027,8 +1027,8 @@ msgstr "Introducir o URL a descargar:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Introduce un URL desde o cal os datos deberían ser descargados"
 
-msgid "Separate Layer"
-msgstr "Capa separada"
+msgid "Download as new layer"
+msgstr "Descargar como unha nova capa"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Escoller se o dato debería estar nunha nova capa"
@@ -2393,12 +2393,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"
@@ -8577,9 +8577,6 @@ msgstr "Requírese un valor no rango [-90,90] para a latitude."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Requírese un valor no rango [-180,180] para a lonxitude."
 
-msgid "Download as new layer"
-msgstr "Descargar como unha nova capa"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10074,6 +10071,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -13189,9 +13189,6 @@ msgstr "Control Remoto"
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr ""
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14944,6 +14941,10 @@ msgstr "Manter o complemento"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Prema para manter o complemento «{0}»"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr ""
 
@@ -14953,10 +14954,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 ""
@@ -16793,10 +16790,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -18283,6 +18276,9 @@ msgstr "Bio Diesel"
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "91 octanos"
 
@@ -18304,6 +18300,9 @@ msgstr "E10 (mezcla ao 10% de etanol)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (mezcla ao 85% de etanol)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GLP (Gas licuado do petróleo)"
 
@@ -20958,6 +20957,12 @@ msgstr "Fonte"
 msgid "Water Well"
 msgstr "Pozo de auga"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Faro"
 
@@ -24029,6 +24034,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 ""
 
@@ -24110,7 +24142,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -24125,7 +24157,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 ""
@@ -24133,21 +24165,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 ""
 
@@ -24286,13 +24340,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"
@@ -24325,14 +24379,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 ""
@@ -24398,7 +24452,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)"
@@ -24485,13 +24539,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)"
@@ -24659,34 +24713,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 ""
@@ -24694,7 +24747,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)"
@@ -24742,7 +24795,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24750,7 +24803,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 ""
@@ -24919,8 +24972,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 ""
@@ -24928,9 +24980,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 ""
@@ -24938,10 +24988,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"
@@ -24974,57 +25024,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 ""
@@ -25032,13 +25077,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 ""
@@ -25106,13 +25151,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 ""
@@ -25120,7 +25165,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -25128,7 +25173,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -25136,19 +25181,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 ""
@@ -25253,13 +25298,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 ""
@@ -25267,7 +25312,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)"
@@ -25361,13 +25406,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 ""
 
@@ -25455,6 +25493,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 ""
 
@@ -25463,6 +25515,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 ""
 
@@ -25470,13 +25546,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 ""
@@ -25490,7 +25566,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 ""
@@ -25498,29 +25574,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)"
@@ -25589,7 +25664,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"
@@ -25622,6 +25700,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 ""
 
@@ -25670,33 +25754,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 ""
@@ -25704,7 +25786,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)"
@@ -25750,25 +25832,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"
@@ -25792,7 +25874,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)"
@@ -25888,7 +25970,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 ""
@@ -25896,6 +25978,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 ""
 
@@ -25914,7 +26003,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)"
@@ -25976,7 +26065,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 ""
@@ -25984,13 +26073,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)"
@@ -26077,7 +26166,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 ""
@@ -26085,7 +26181,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"
@@ -26100,6 +26196,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -27091,32 +27193,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"
@@ -27125,9 +27223,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 ""
 
@@ -27234,6 +27329,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 ""
 
@@ -27277,6 +27375,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."
@@ -27310,6 +27411,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -27359,6 +27463,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 "Usar scripts externos en JOSM"
 
@@ -27529,6 +27638,9 @@ msgstr ""
 "Permite abrir ficheiros gpx/osm que conteñen parte da área actualmente "
 "visíbel"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -28341,550 +28453,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 "Non aparcar"
-
-msgid "No overtaking"
-msgstr ""
-
-msgid "Pedestrian crossing"
-msgstr "Cruzamento peonal"
-
-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 "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 ""
 
@@ -29580,6 +29148,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 ""
 
@@ -29613,9 +29279,30 @@ msgstr "Construíndo etiquetas:"
 msgid "Cannot place building outside of the world."
 msgstr "Non emplazar edificios fora do mundo."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Crear edificio."
 
+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 "Estabelecer tamaño dos edificios"
 
@@ -29628,8 +29315,17 @@ msgstr "Escoller automaticamente un edificio"
 msgid "Use address nodes under buildings"
 msgstr ""
 
-msgid "Buildings width:"
-msgstr "Largo dos edificios:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr ""
@@ -30321,6 +30017,18 @@ msgstr ""
 msgid "Color Schemes"
 msgstr "Esquemas de cores"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Cancelar edición de etiquetas e pechar o diálogo"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Aplicar etiquetas editadas e pechar o diálogo"
+
 msgid "Conflation"
 msgstr ""
 
@@ -30815,6 +30523,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30847,22 +30558,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"
@@ -30956,6 +30658,9 @@ msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 "Importar datos do capturador de datos Globalsat DG100 dentro de unha capa GPX"
 
+msgid "Import"
+msgstr "Importar"
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31645,7 +31350,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"
@@ -31678,31 +31401,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"
@@ -32787,6 +32571,27 @@ msgstr "Extensión de ficheiro descoñecida: {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"
 
@@ -33120,6 +32925,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33857,6 +33665,9 @@ msgstr ""
 msgid "State"
 msgstr "Estado/Provincia"
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -34269,12 +34080,6 @@ msgstr "Novo valor para {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr "Fallou ao abrir a conexión da 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>"
@@ -34611,12 +34416,6 @@ msgstr "Complemento de etiquetas de JOSM"
 msgid "Presets"
 msgstr "Predefinidos"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Cancelar edición de etiquetas e pechar o diálogo"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Aplicar etiquetas editadas e pechar o diálogo"
-
 msgid "Highlight"
 msgstr "Realzar"
 
@@ -36171,39 +35970,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 ""
 
@@ -36277,9 +36043,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/he.po b/i18n/po/he.po
index 1bd0241..ca367fb 100644
--- a/i18n/po/he.po
+++ b/i18n/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2017-06-04 17:31+0000\n"
 "Last-Translator: SwiftFast <Unknown>\n"
 "Language-Team: Hebrew <he at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:46+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:46+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: he\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -954,8 +954,8 @@ msgstr "הזן כתובת להורדה:"
 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 ""
@@ -2257,12 +2257,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"
@@ -8275,9 +8275,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>"
@@ -9732,6 +9729,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12784,9 +12784,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 ""
 
@@ -14479,6 +14476,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 ""
 
@@ -14488,10 +14489,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 ""
@@ -16317,10 +16314,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17806,6 +17799,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17827,6 +17823,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20480,6 +20479,12 @@ msgstr "מזרקה"
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "מגדלור"
 
@@ -23551,6 +23556,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 ""
 
@@ -23632,7 +23664,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23647,7 +23679,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 ""
@@ -23655,21 +23687,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 ""
 
@@ -23808,13 +23862,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"
@@ -23847,14 +23901,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 ""
@@ -23920,7 +23974,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)"
@@ -24007,13 +24061,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)"
@@ -24181,34 +24235,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 ""
@@ -24216,7 +24269,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)"
@@ -24264,7 +24317,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24272,7 +24325,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 ""
@@ -24441,8 +24494,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 ""
@@ -24450,9 +24502,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 ""
@@ -24460,10 +24510,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"
@@ -24496,57 +24546,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 ""
@@ -24554,13 +24599,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 ""
@@ -24628,13 +24673,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 ""
@@ -24642,7 +24687,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24650,7 +24695,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24658,19 +24703,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 ""
@@ -24775,13 +24820,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 ""
@@ -24789,7 +24834,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)"
@@ -24883,13 +24928,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 ""
 
@@ -24977,6 +25015,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 ""
 
@@ -24985,6 +25037,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 ""
 
@@ -24992,13 +25068,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 ""
@@ -25012,7 +25088,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 ""
@@ -25020,29 +25096,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)"
@@ -25111,7 +25186,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"
@@ -25144,6 +25222,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 ""
 
@@ -25192,33 +25276,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 ""
@@ -25226,7 +25308,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)"
@@ -25272,25 +25354,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"
@@ -25314,7 +25396,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)"
@@ -25410,7 +25492,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 ""
@@ -25418,6 +25500,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 ""
 
@@ -25436,7 +25525,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)"
@@ -25498,7 +25587,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 ""
@@ -25506,13 +25595,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)"
@@ -25599,7 +25688,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 ""
@@ -25607,7 +25703,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"
@@ -25622,6 +25718,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26613,32 +26715,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"
@@ -26647,9 +26745,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 ""
 
@@ -26756,6 +26851,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 ""
 
@@ -26799,6 +26897,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."
@@ -26832,6 +26933,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26879,6 +26983,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 ""
 
@@ -27044,6 +27153,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 ""
@@ -27833,550 +27945,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 ""
 
@@ -29071,6 +28639,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 ""
 
@@ -29104,9 +28770,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 ""
 
@@ -29119,7 +28806,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:"
@@ -29798,6 +29494,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 ""
 
@@ -30292,6 +30000,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30324,22 +30035,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"
@@ -30429,6 +30131,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr "ייבא"
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31118,7 +30823,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"
@@ -31151,31 +30874,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"
@@ -32259,6 +32043,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 ""
 
@@ -32593,6 +32398,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33330,6 +33138,9 @@ msgstr ""
 msgid "State"
 msgstr "מדינה"
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33740,12 +33551,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>"
@@ -34082,12 +33887,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35628,39 +35427,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 ""
 
@@ -35734,9 +35500,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/hi.po b/i18n/po/hi.po
index 8bbc39b..f6bae38 100644
--- a/i18n/po/hi.po
+++ b/i18n/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2009-11-14 16:28+0000\n"
 "Last-Translator: nipunreddevil <nipunreddevil at gmail.com>\n"
 "Language-Team: Hindi <hi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:47+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:47+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: hi\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/hr.po b/i18n/po/hr.po
index 0790059..a183c0e 100644
--- a/i18n/po/hr.po
+++ b/i18n/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2016-01-04 15:56+0000\n"
 "Last-Translator: gogo <trebelnik2 at gmail.com>\n"
 "Language-Team: Croatian <hr at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:00+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:01+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: hr\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -988,8 +988,8 @@ msgstr "Ukucaj URL za preuzimanje:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Unesite URL adresu s koje se podaci trebaju preuzeti"
 
-msgid "Separate Layer"
-msgstr "Razdjeli sloj (layer)"
+msgid "Download as new layer"
+msgstr "Preuzmi kao novi sloj"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr ""
@@ -2332,12 +2332,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"
@@ -8368,9 +8368,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr "Preuzmi kao novi sloj"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9846,6 +9843,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12893,9 +12893,6 @@ msgstr ""
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr "Preuzmi objekte u novi sloj"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14588,6 +14585,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 ""
 
@@ -14597,10 +14598,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 ""
@@ -16424,10 +16421,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17913,6 +17906,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17934,6 +17930,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20587,6 +20586,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23658,6 +23663,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 ""
 
@@ -23739,7 +23771,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23754,7 +23786,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 ""
@@ -23762,21 +23794,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 ""
 
@@ -23915,13 +23969,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"
@@ -23954,14 +24008,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 ""
@@ -24027,7 +24081,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)"
@@ -24114,13 +24168,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)"
@@ -24288,34 +24342,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 ""
@@ -24323,7 +24376,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)"
@@ -24371,7 +24424,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24379,7 +24432,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 ""
@@ -24548,8 +24601,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 ""
@@ -24557,9 +24609,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 ""
@@ -24567,10 +24617,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"
@@ -24603,57 +24653,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 ""
@@ -24661,13 +24706,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 ""
@@ -24735,13 +24780,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 ""
@@ -24749,7 +24794,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24757,7 +24802,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24765,19 +24810,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 ""
@@ -24882,13 +24927,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 ""
@@ -24896,7 +24941,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)"
@@ -24990,13 +25035,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 ""
 
@@ -25084,6 +25122,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 ""
 
@@ -25092,6 +25144,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 ""
 
@@ -25099,13 +25175,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 ""
@@ -25119,7 +25195,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 ""
@@ -25127,29 +25203,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)"
@@ -25218,7 +25293,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"
@@ -25251,6 +25329,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 ""
 
@@ -25299,33 +25383,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 ""
@@ -25333,7 +25415,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)"
@@ -25379,25 +25461,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"
@@ -25421,7 +25503,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)"
@@ -25517,7 +25599,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 ""
@@ -25525,6 +25607,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 ""
 
@@ -25543,7 +25632,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)"
@@ -25605,7 +25694,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 ""
@@ -25613,13 +25702,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)"
@@ -25706,7 +25795,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 ""
@@ -25714,7 +25810,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"
@@ -25729,6 +25825,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26720,32 +26822,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"
@@ -26754,9 +26852,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 ""
 
@@ -26863,6 +26958,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 ""
 
@@ -26906,6 +27004,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."
@@ -26939,6 +27040,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26986,6 +27090,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 ""
 
@@ -27151,6 +27260,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 ""
@@ -27940,550 +28052,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 ""
 
@@ -29178,6 +28746,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 "Previše puteva je dodano: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -29211,9 +28877,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 ""
 
@@ -29226,7 +28913,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:"
@@ -29905,6 +29601,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 ""
 
@@ -30399,6 +30107,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30431,22 +30142,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"
@@ -30536,6 +30238,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31225,7 +30930,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"
@@ -31258,31 +30981,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"
@@ -32363,6 +32147,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 ""
 
@@ -32696,6 +32501,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33433,6 +33241,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr "[nepotpun]"
 
@@ -33843,12 +33654,6 @@ msgstr "Nova vrijednost za {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>"
@@ -34185,12 +33990,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35733,39 +35532,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 ""
 
@@ -35839,9 +35605,6 @@ msgstr ""
 msgid "Please select two nodes connected by way!"
 msgstr ""
 
-msgid "Too many ways are added: {0}!"
-msgstr "Previše puteva je dodano: {0}!"
-
 msgid "All inside [testing]"
 msgstr ""
 
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index d2a5476..f603095 100644
--- a/i18n/po/ht.po
+++ b/i18n/po/ht.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2010-03-11 21:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Haitian; Haitian Creole <ht at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:46+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:46+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: \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/hu.po b/i18n/po/hu.po
index e04574c..3a4d0d4 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-28 21:40+0000\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-27 14:39+0000\n"
 "Last-Translator: Báthory Péter <bathory86p at gmail.com>\n"
 "Language-Team: Hungarian <kde-l10n-hu at kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:47+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:47+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: hu\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1034,8 +1034,8 @@ msgstr "Add meg a letöltendő URL-t:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Adj meg egy URL-t, ahonnan az adatok letöltendők"
 
-msgid "Separate Layer"
-msgstr "Külön rétegen"
+msgid "Download as new layer"
+msgstr "Letöltés új rétegre"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Jelöld be, ha az adatokat egy új rétegre szeretnéd letölteni"
@@ -2451,12 +2451,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"
@@ -4326,7 +4326,7 @@ msgid "Crossing ways"
 msgstr "Keresztező vonalak"
 
 msgid "Crossing buildings"
-msgstr "Egymást keresztező épületek."
+msgstr "Keresztezett épületek"
 
 msgid "Crossing waterways"
 msgstr "Keresztező folyóvizek"
@@ -8915,9 +8915,6 @@ msgstr "A szélesség értéke [-90,90] tartományban kell legyen."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "A hosszúság értéke  [-180,180] tartományban kell legyen."
 
-msgid "Download as new layer"
-msgstr "Letöltés új rétegre"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10591,6 +10588,9 @@ msgstr "Nem található adat a(z) ''{0}'' fájlban."
 msgid "Open OSM file"
 msgstr "OSM fájl megnyitása"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr "Hibakeresési hiba fájlok"
 
@@ -13911,9 +13911,6 @@ msgstr "Távirányító"
 msgid "Settings for the remote control feature."
 msgstr "A távirányító funkció beállításai"
 
-msgid "Download objects to new layer"
-msgstr "Objektumok letöltése új rétegre"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Minden Távirányító művelet engedélyeztetése manuálisan"
 
@@ -15837,6 +15834,12 @@ msgstr "Bővítmény megtartása"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Kattints a(z) ''{0}'' bővítmény megtartásához"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"A(z) ''{0}'' bővítmény telepítése a letöltött ideiglenes fájlból ''{1}'' "
+"sikeretelen. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "A(z) elavult ''{0}'' bővítmény törlése sikertelen."
 
@@ -15848,12 +15851,6 @@ msgstr ""
 "kihagyása. A JOSM továbbra is a régi bővítmény verziót tölti be."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"A(z) ''{0}'' bővítmény telepítése a letöltött ideiglenes fájlból ''{1}'' "
-"sikeretelen. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -17860,10 +17857,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "kis épület"
-
 msgid "Start date"
 msgstr "Kezdő dátum"
 
@@ -19372,6 +19365,9 @@ msgstr "Biodízel"
 msgid "Octane 80"
 msgstr "80 oktános benzin"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "91 oktános benzin"
 
@@ -19393,6 +19389,9 @@ msgstr "E10 (10%-os etanolkeverék)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85%-os etanolkeverék)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (autógáz)"
 
@@ -22053,6 +22052,12 @@ msgstr "Szökőkút"
 msgid "Water Well"
 msgstr "Kút"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Világítótorony"
 
@@ -25153,6 +25158,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"
 
@@ -25234,8 +25266,8 @@ msgstr "OSM Inspector: lakcímek"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM Inspector: Partvonal (EU)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr "imagico.de OSM képek térképezéshez: Prokletije-hegység (Albán Alpok)"
+msgid "imagico.de: Prokletije Mountains"
+msgstr "imagico.de: Prokletije-hegység (Albán Alpok)"
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
@@ -25251,24 +25283,40 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
-msgstr "imagico.de OSM képek térképezéshez: Dél-Transzantarktiszi-hegység"
+msgid "imagico.de: Southern Transantarctic Mountains"
+msgstr "imagico.de: Dél-Transzantarktiszi-hegység"
 
 msgid ""
 "Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
-msgstr "imagico.de OSM képek térképezéshez: Pensacola-hegység"
+msgid "imagico.de: Pensacola Mountains"
+msgstr "imagico.de: Pensacola-hegység"
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
-msgstr "imagico.de OSM képek térképezéshez: Elefánt-sziget/Clarence-sziget"
+msgid "imagico.de: Elephant Island/Clarence Island"
+msgstr "imagico.de: Elefánt-sziget/Clarence-sziget"
 
 msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+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)"
@@ -25276,6 +25324,12 @@ msgstr ""
 "Az antarktiszi Enderby-földről és Kemp-partról a Sentinel-2 műhold által "
 "készített képek (valós színek)"
 
+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 ""
 
@@ -25414,13 +25468,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"
@@ -25453,15 +25507,15 @@ msgstr "LPI NSW közigazgatási határ állami erdő"
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW közigazgatási határ NPWS rezervátum"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
-msgstr "imagico.de OSM képek térképezéshez: Északnyugat-Heard-sziget"
+msgid "imagico.de: Northwest Heard Island"
+msgstr "imagico.de: Északnyugat-Heard-sziget"
 
 msgid ""
 "Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Heard Island coast"
-msgstr "imagico.de OSM képek térképezéshez: Heard-sziget part"
+msgid "imagico.de: Heard Island coast"
+msgstr "imagico.de: Heard-sziget part"
 
 msgid ""
 "Recent image of Heard island with interior mostly cloud covered but mostly "
@@ -25526,8 +25580,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 képek térképezéshez: Rila- és Pirin-hegységek"
+msgid "imagico.de: Rila and Pirin Mountains"
+msgstr "imagico.de: Rila- és Pirin-hegységek"
 
 msgid "OpenStreetMap (Belgian Style)"
 msgstr "OpenStreetMap (belga stílus)"
@@ -25613,14 +25667,14 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "Benin: Cotonou Pleiade 2016"
 
-msgid "imagico.de OSM images for mapping: Cotonou"
-msgstr "imagico.de OSM képek térképezéshez: Cotonou"
+msgid "imagico.de: Cotonou"
+msgstr "imagico.de: Cotonou"
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
-msgstr "imagico.de OSM képek térképezéshez: Bouvet-sziget"
+msgid "imagico.de: Bouvet Island"
+msgstr "imagico.de: Bouvet-sziget"
 
 msgid "For more accurate coastline and glacier mapping (true color)"
 msgstr ""
@@ -25787,43 +25841,42 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna utak rátét"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
-msgstr "imagico.de OSM képek térképezéshez: Keleti-Devon-sziget partvonal"
+msgid "imagico.de: Eastern Devon Island coast"
+msgstr "imagico.de: Keleti-Devon-sziget partvonal"
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
-msgstr "imagico.de OSM képek térképezéshez: Északi-Ellesmere-sziget"
+msgid "imagico.de: Northern Ellesmere Island"
+msgstr "imagico.de: Északi-Ellesmere-sziget"
 
 msgid ""
 "Assembled from July 2012 ASTER imagery (true color with estimated blue)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
-msgstr "imagico.de OSM képek térképezéshez: Északi-Ellesmere-sziget 2016"
+msgid "imagico.de: Northern Ellesmere Island July 2016"
+msgstr "imagico.de: Északi-Ellesmere-sziget 2016"
 
 msgid ""
 "Assembled from July 2016 ASTER imagery (true color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
-msgstr "imagico.de OSM képek térképezéshez: Fogo, Cape Verde"
+msgid "imagico.de: Fogo, Cape Verde"
+msgstr "imagico.de: Fogo, Cape Verde"
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
-msgstr "imagico.de OSM képek térképezéshez: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
+msgstr "imagico.de: Isla Londonderry"
 
 msgid ""
 "A lot of very coarse coastlines could be improved here, much snow cover "
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
-msgstr "imagico.de OSM képek térképezéshez: 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 ""
@@ -25870,17 +25923,16 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
-msgstr "imagico.de OSM képek térképezéshez: El Altar"
+msgid "imagico.de: El Altar"
+msgstr "imagico.de: El Altar"
 
 msgid ""
 "2007 ASTER image offering better glacier coverage than common sources (true "
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
-msgstr ""
-"imagico.de OSM képek térképezéshez: Darwin- és Wolf-szigetek, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
+msgstr "imagico.de: Darwin- és Wolf-szigetek, Galapagos"
 
 msgid ""
 "Recent image, only old and poor images in other sources currently (true "
@@ -26050,32 +26102,26 @@ msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr "Metropole Ruhr: légifelvételek (10 cm)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
-msgstr ""
-"imagico.de OSM képek térképezéshez: Észak-német nyugati parti árapálysíkságok"
+msgid "imagico.de: Northern German west coast tidalflats"
+msgstr "imagico.de: Észak-német nyugati parti árapálysíkságok"
 
 msgid ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
-msgstr ""
-"imagico.de OSM képek térképezéshez: Észak-német nyugati parti "
-"árapálysíkságok (infravörös)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
+msgstr "imagico.de: Észak-német nyugati parti árapálysíkságok (infravörös)"
 
 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"
@@ -26108,79 +26154,68 @@ msgstr "Mainz legfrissebb légifotó"
 msgid "Munich latest aerial imagery 60cm"
 msgstr "München legfrissebb légifotó 60cm"
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
-msgstr "imagico.de OSM képek térképezéshez: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
+msgstr "imagico.de: Qasigiannguit"
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
-msgstr "imagico.de OSM képek térképezéshez: Thule légibázis"
+msgid "imagico.de: Thule Air Base"
+msgstr "imagico.de: Thule légibázis"
 
 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 OSM képek térképezéshez: Thule légibázis DMS alacsony magasságú "
-"átrepülés 2015 szeptember"
+"imagico.de: Thule légibázis DMS alacsony magasságú átrepülés 2015 szeptember"
 
 msgid ""
 "Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
-"2015"
-msgstr ""
-"imagico.de OSM képek térképezéshez: Thule légibázis DMS átrepülés 2015 "
-"szeptember"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
+msgstr "imagico.de: Thule légibázis DMS átrepülés 2015 szeptember"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
-msgstr ""
-"imagico.de OSM képek térképezéshez: Thule légibázis DMS átrepülés 2015 "
-"október"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
+msgstr "imagico.de: Thule légibázis DMS átrepülés 2015 október"
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
-msgstr "imagico.de OSM képek térképezéshez: Grönland mozaik"
+msgid "imagico.de: Greenland mosaic"
+msgstr "imagico.de: Grönland mozaik"
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
-msgstr "imagico.de OSM képek térképezéshez: 2013 május ferdetengelyű Landsat"
+msgid "imagico.de: May 2013 off-nadir Landsat"
+msgstr "imagico.de: 2013 május ferdetengelyű Landsat"
 
 msgid ""
 "First available image north of the regular Landsat limit, mostly with "
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
-msgstr ""
-"imagico.de OSM képek térképezéshez: Landsat, ferdetengelyű, 2016 július"
+msgid "imagico.de: Landsat off-nadir July 2016"
+msgstr "imagico.de: Landsat, ferdetengelyű, 2016 július"
 
 msgid "Latest images north of the regular Landsat limit (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
-msgstr "imagico.de OSM képek térképezéshez: Észak-Grönland ASTER"
+msgid "imagico.de: Northern Greenland ASTER"
+msgstr "imagico.de: Észak-Grönland ASTER"
 
 msgid ""
 "Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
@@ -26247,21 +26282,21 @@ msgstr "OpenStreetMap Magyarország (turistautak)"
 msgid "Hillshade Hungary"
 msgstr "Domborzatárnyékolás, Magyarország"
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
-msgstr "imagico.de OSM képek térképezéshez: Kelet-Izland"
+msgid "imagico.de: Eastern Iceland"
+msgstr "imagico.de: Kelet-Izland"
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
-msgstr "imagico.de OSM képek térképezéshez: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
+msgstr "imagico.de: Rann of Kutch"
 
 msgid ""
 "Land/water distinction difficult to properly map based on Bing/Mapbox images "
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -26269,27 +26304,27 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
-msgstr "imagico.de OSM képek térképezéshez: Délkeleti-Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
+msgstr "imagico.de: Délkeleti-Sulawesi"
 
 msgid ""
 "Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
-msgstr "imagico.de OSM képek térképezéshez:  Bakun-víztározó"
+msgid "imagico.de: Bakun Reservoir"
+msgstr "imagico.de:  Bakun-víztározó"
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
-msgstr "imagico.de OSM képek térképezéshez: Batam"
+msgid "imagico.de: Batam"
+msgstr "imagico.de: Batam"
 
 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 ""
@@ -26394,13 +26429,13 @@ msgstr "Japán GSI ortofotó"
 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 ""
@@ -26408,8 +26443,8 @@ msgid ""
 "north (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
-msgstr "imagico.de OSM képek térképezéshez: 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 ""
@@ -26502,13 +26537,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 ""
 
@@ -26596,6 +26624,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 ""
 
@@ -26604,6 +26646,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 ""
 
@@ -26611,14 +26677,14 @@ 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 "Sentinel-2 mozaikfelvétel Svalbardról (Spitzbergák), valós színek"
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
-msgstr "imagico.de OSM képek térképezéshez: Nyugat-Karakorum"
+msgid "imagico.de: Western Karakoram"
+msgstr "imagico.de: Nyugat-Karakorum"
 
 msgid ""
 "Represents approximately minimum snow cover so can be well used for glacier "
@@ -26631,40 +26697,37 @@ 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 képek térképezéshez: Panama-csatorna - csendes-óceáni oldal"
+msgid "imagico.de: Panama Canal - Pacific side"
+msgstr "imagico.de: Panama-csatorna - csendes-óceáni oldal"
 
 msgid ""
 "New locks with less clouds than in the Sentinel-2 image - make sure to check "
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
-msgstr "imagico.de OSM képek térképezéshez: Panama-csatorna"
+msgid "imagico.de: Panama Canal"
+msgstr "imagico.de: Panama-csatorna"
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
-msgstr "imagico.de OSM képek térképezéshez: Vanatinai"
+msgid "imagico.de: Vanatinai"
+msgstr "imagico.de: Vanatinai"
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
-msgstr "imagico.de OSM képek térképezéshez: New Ireland"
+msgid "imagico.de: New Ireland"
+msgstr "imagico.de: New Ireland"
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Coropuna"
-msgstr "imagico.de OSM képek térképezéshez: Coropuna"
+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 képek térképezéshez: Willkanuta-hegység és Quelccaya-jégsapka"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr "imagico.de: Willkanuta-hegység és Quelccaya-jégsapka"
 
 msgid "Poor and outdated imagery in other sources (true color)"
 msgstr ""
@@ -26732,7 +26795,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"
@@ -26765,6 +26831,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 ""
 
@@ -26813,13 +26885,13 @@ msgstr "ScanEx IRS"
 msgid "ScanEx SPOT"
 msgstr "ScanEx SPOT"
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
-msgstr "imagico.de OSM képek térképezéshez: Kerch-szoros"
+msgid "imagico.de: Kerch Strait"
+msgstr "imagico.de: Kerch-szoros"
 
 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)"
@@ -26827,31 +26899,28 @@ msgstr ""
 "A Pecsora-tenger partjáról a Sentinel-2 műhold által 2016 őszén készített "
 "kép (valós színek)"
 
-msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
-msgstr "imagico.de OSM képek térképezéshez: Usakov-sziget 2016 augusztus"
+msgid "imagico.de: Ushakov Island August 2016"
+msgstr "imagico.de: Usakov-sziget 2016 augusztus"
 
 msgid "Up-to-date late summer imagery with few clouds (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern 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"
-msgstr ""
-"imagico.de OSM képek térképezéshez: Északi- és Sarki-Urál 2016 augusztus"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
+msgstr "imagico.de: Északi- és Sarki-Urál 2016 augusztus"
 
 msgid ""
 "Up-to-date late summer imagery with few clouds - caution: not all visible "
 "snow is glaciers (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
-msgstr "imagico.de OSM képek térképezéshez: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
+msgstr "imagico.de: Vostochny Cosmodrome"
 
 msgid "Recent image showing newest features (true color)"
 msgstr ""
@@ -26896,26 +26965,26 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "South Africa CD:NGI Aerial"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
-msgstr "imagico.de OSM képek térképezéshez: Leskov-sziget ASTER"
+msgid "imagico.de: Leskov Island ASTER"
+msgstr "imagico.de: Leskov-sziget ASTER"
 
 msgid "Missing in other image sources (true color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Scott Island"
-msgstr "imagico.de OSM képek térképezéshez: Scott-sziget"
+msgid "imagico.de: Scott Island"
+msgstr "imagico.de: Scott-sziget"
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
-msgstr "imagico.de OSM képek térképezéshez: Leskov-sziget Landsat"
+msgid "imagico.de: Leskov Island Landsat"
+msgstr "imagico.de: Leskov-sziget Landsat"
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
-msgstr "imagico.de OSM képek térképezéshez: Clerke-sziklák"
+msgid "imagico.de: Clerke Rocks"
+msgstr "imagico.de: Clerke-sziklák"
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
-msgstr "imagico.de OSM képek térképezéshez: Shag-sziklák"
+msgid "imagico.de: Shag Rocks"
+msgstr "imagico.de: Shag-sziklák"
 
 msgid "Catastro Spain"
 msgstr "Catastro Spain"
@@ -26938,8 +27007,8 @@ msgstr "IDEIB - Balearic Islands"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Canary Islands"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
-msgstr "imagico.de OSM képek térképezéshez: Adams-híd"
+msgid "imagico.de: Adams Bridge"
+msgstr "imagico.de: Adams-híd"
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr ""
@@ -27034,15 +27103,21 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr "Basel-Landschaft kanton 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 képek térképezéshez: Középső-Alpok 2016 késő szeptember"
 
 msgid ""
 "Up-to-date image for glacier mapping - beware of some fresh snow at higher "
 "altitudes (true color)"
 msgstr ""
 
+msgid "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"
 
@@ -27061,8 +27136,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 képek térképezéshez:  Kilimandzsáró 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
+msgstr "imagico.de:  Kilimandzsáró 2016"
 
 msgid "Aşgabat (high resolution)"
 msgstr ""
@@ -27123,21 +27198,21 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "U.S. erdőgazdasági utak"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
-msgstr "imagico.de OSM képek térképezéshez: Alaszka"
+msgid "imagico.de: Alaska Range"
+msgstr "imagico.de: Alaszka"
 
 msgid ""
 "Recent summer image of the Alaska Range for mapping natural features (true "
 "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)"
@@ -27224,16 +27299,23 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
-msgstr "imagico.de OSM képek térképezéshez: Rwenzori-hegység"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
+msgstr "imagico.de: Rwenzori-hegység"
 
 msgid ""
 "Recent image of most of the remaining Rwenzori Mountains glaciers (false "
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
-msgstr "imagico.de OSM képek térképezéshez: Rwenzori-hegység 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
+msgstr "imagico.de: Rwenzori-hegység 2016"
 
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Ukraine - Ortofotó térkép 2012"
@@ -27247,6 +27329,12 @@ msgstr "Ukrajna - Kijev 2014 (DZK)"
 msgid "7th Series (OS7)"
 msgstr "7. sorozat (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr "OS New Popular Edition történelmi"
 
@@ -28277,52 +28365,38 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr "{0} csak számokat tartalmazhat, szükség szerint .5 lépésekben"
 
+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}: a méter az alapértelmezett; a pont az elválasztó; ha egységek vannak, "
-"szóköz kell a mértékegység után"
 
 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}: a tonna az alapértelmezett; tizedeselválasztó a pont; ha van "
-"mértékegység, előtte szóköz kell"
 
-msgid "unusual {0} format"
-msgstr "furcsa {0} formátum"
+msgid "unusual value of {0}"
+msgstr "{0} értéke szokatlan"
 
 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}: a kilométer az alapértelmezett; tizedeselválasztó a pont; ha van "
-"mértékegység, előtte szóköz kell"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 "a feszültségnek voltban kellene lennie, mértékenység, határoló vagy szóköz "
 "nélkül"
 
-msgid "unusual {0} specification"
-msgstr "{0} meghatározása szokatlan"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "szokatlan vonatsín-nyomtáv; használj mm-t elválasztó nélkül"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr ""
-"szokatlan incline érték; használj százalékot/fokot, vagy up/down értéket"
-
 msgid "{0} must be a numeric value"
 msgstr "a(z) {0}-nak szám értéket kell adni"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} pozitív egész szám kell legyen"
 
-msgid "unusual value of {0}"
-msgstr "{0} értéke szokatlan"
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr "A(z) {0}-nak/-nek számnak kell lennie, méterben, mértékegység nélkül"
 
@@ -28433,6 +28507,9 @@ msgstr "Ikonok elrejtése alacsony nagyításon"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Kevésbé tolakodó pont szimbólumok alacsony nagyításnál"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Utca feliratok megjelenítése (magas nagyításnál)"
 
@@ -28492,6 +28569,9 @@ msgstr ""
 "Automatikusan hozzárendeli a címet a kijelölt objektumhoz Ausztriában.  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."
@@ -28539,6 +28619,9 @@ msgstr ""
 "Egy parancssort valósít meg és lehetővé teszi a saját parancsok létrehozását "
 "is. Nézd meg a hivatkozást a szabvány parancsokhoz (arc, circle stb.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr "Adatok egyesítésére szolgáló eszköz (megfeleltetés és összevonás)"
 
@@ -28596,6 +28679,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "A Francia EPCI-k kezelése (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Külső szkriptek használata a JOSM-ben"
 
@@ -28815,6 +28903,9 @@ msgstr ""
 "Lehetővé teszi az éppen látható képernyő területet keresztező GPX/OSM fájlok "
 "megnyitását"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -29694,552 +29785,6 @@ msgstr "Georeferált kép importálása"
 msgid "Error while creating image layer: "
 msgstr "Hiba a kép réteg létrehozásakor: "
 
-msgid "Mapillary Images"
-msgstr "Mapillary képek"
-
-msgid "Mapillary layer"
-msgstr "Mapillary réteg"
-
-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 képek letöltése a jelenlegi nézeten"
-
-msgid "Export pictures"
-msgstr "Képek exportálás"
-
-msgid "Export Mapillary pictures"
-msgstr "Mapillary képek exportálása"
-
-msgid "Export images"
-msgstr "Képek exportálása"
-
-msgid "Import pictures"
-msgstr "Képek importálása"
-
-msgid "Import local pictures"
-msgstr "Helyi képek importálása"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Képek importálása a Mapillary rétegre"
-
-msgid "Join mode"
-msgstr "Összekapcsolási mód"
-
-msgid "Join/unjoin pictures"
-msgstr "Képek össze/szétkapcsolása"
-
-msgid "Submit changeset"
-msgstr "Módosításcsomag beküldése"
-
-msgid "Submit the current changeset"
-msgstr "A jelenlegi módosításcsomag beküldése"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "A jelenlegi módosításcsomag beküldése Mapillary-re"
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr "függőben"
-
-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 "Gyalogos mód"
-
-msgid "Zoom to selected image"
-msgstr "Nagyítása a kijelölt képre"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Nagyítás a jelenleg kijelölt Mapillary képre"
-
-msgid "Current Mapillary changeset"
-msgstr "Jelenlegi Mapillary módosításcsomag"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Mapillary módosításcsomag dialógusablak megnyitása"
-
-msgid "Mapillary changeset"
-msgstr "Mapillary módosításcsomag"
-
-msgid "Submitting changeset to server…"
-msgstr ""
-
-msgid "Export all images"
-msgstr "Összes kép exportálása"
-
-msgid "Export selected sequence"
-msgstr "Kijelölt sorozat exportálása"
-
-msgid "Export selected images"
-msgstr "Kijelölt képek exportálása"
-
-msgid "Rewrite imported images"
-msgstr "Importált képek átírása"
-
-msgid "Select a directory"
-msgstr "Könyvtár kijelölése"
-
-msgid "Explore"
-msgstr "Böngészés"
-
-msgid "Speed limit"
-msgstr "Sebességkorlátozás"
-
-msgid "Give way"
-msgstr "Elsőbbségadás"
-
-msgid "No entry"
-msgstr "Behajtani tilos"
-
-msgid "Intersection danger"
-msgstr "Veszélyes útkereszteződés"
-
-msgid "Mandatory direction (any)"
-msgstr "Kötelező haladási irány"
-
-msgid "Uneven road"
-msgstr "Egyenetlen úttest"
-
-msgid "No parking"
-msgstr "Megállni tilos"
-
-msgid "No overtaking"
-msgstr "Előzni tilos"
-
-msgid "Pedestrian crossing"
-msgstr "Gyalogosátkelő"
-
-msgid "No turn"
-msgstr "Bekanyarodni tilos"
-
-msgid "Years"
-msgstr "Év"
-
-msgid "Months"
-msgstr "Hónap"
-
-msgid "Days"
-msgstr "Nap"
-
-msgid "Imported images"
-msgstr "Importált képek"
-
-msgid "Mapillary filter"
-msgstr "Mapillary szűrő"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Mapillary szűrő ablak megnyitása"
-
-msgid "Not older than: "
-msgstr "Nem régebbi mint: "
-
-msgid "Downloaded images"
-msgstr "Letöltött képek"
-
-msgid "Only images with signs"
-msgstr "Csak jelzőtáblás képek"
-
-msgid "Choose signs"
-msgstr "Válassz táblát"
-
-msgid "Mapillary history"
-msgstr "Mapillary előzmények"
-
-msgid "Open Mapillary history dialog"
-msgstr "Mapillary előzmény-párbeszédablak megnyitása"
-
-msgid "No image selected"
-msgstr "Nincs kép kijelölve"
-
-msgid "Press \"{0}\" to download images"
-msgstr "Képek letöltéséhez nyomd meg a következőt: ''{0}''"
-
-msgid "Mapillary picture"
-msgstr "Mapillary-kép"
-
-msgid "Open Mapillary window"
-msgstr "Mapillary-ablak megnyitása"
-
-msgid "Next picture"
-msgstr "Következő kép"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Megmutatja a sorozat következő képét"
-
-msgid "Previous picture"
-msgstr "Előző kép"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Megmutatja a sorozat előző képét"
-
-msgid "Jump to red"
-msgstr "Piroshoz ugrás"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "A piros vonal végén lévő képhez ugrik"
-
-msgid "Jump to blue"
-msgstr "Kékhez ugrás"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "A kék vonal végén lévő képhez ugrik"
-
-msgid "Stops the walk."
-msgstr "Séta megállítása"
-
-msgid "Play"
-msgstr "Lejátszás"
-
-msgid "Continues with the paused walk."
-msgstr "Folytatja a szüneteltetett sétát."
-
-msgid "Pause"
-msgstr "Szünet"
-
-msgid "Pauses the walk."
-msgstr "Szünetelteti a sétát."
-
-msgid "Display hour when the picture was taken"
-msgstr "Kép készítési idejének megjelenítése"
-
-msgid "Use 24 hour format"
-msgstr "24 órás formátum használata"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr "Képhez ugrás az előző/következő gomb megnyomásakor"
-
-msgid "Preview images when hovering its icon"
-msgstr "Kép előnézete, ha az egér az ikon fölött áll"
-
-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 "Letöltési mód"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr "Be vagy jelentkezve \"{0}\" néven."
-
-msgid "You are currently not logged in."
-msgstr "Jelenleg nem vagy bejelentkezve."
-
-msgid "Login"
-msgstr "Belépés"
-
-msgid "Logout"
-msgstr "Kijelentkezés"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-"A feltöltés előtt menj a beállításokba és jelentkezz be a Mapillary fiókodba."
-
-msgid "Upload selected sequence"
-msgstr "Kijelölt sorozat feltöltése"
-
-msgid "Delete after upload"
-msgstr "Feltöltés után törlés"
-
-msgid "Wait for full quality pictures"
-msgstr "Várj a teljes minőségű képekre"
-
-msgid "Follow selected image"
-msgstr "Kijelölt kép követése"
-
-msgid "Go forward"
-msgstr "Menj előre"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr "Importálás"
-
-msgid "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 "Importálandó képek kijelölése"
-
-msgid "All images in a directory"
-msgstr ""
-
-msgid "Select directory to import images from"
-msgstr "Az importálandó képeket tartalmazó könyvtár kijelölése"
-
-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} kép törölve"
-msgstr[1] "{0} kép törölve"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "{0} kép importálva"
-msgstr[1] "{0} kép importálva"
-
-msgid "2 images joined"
-msgstr "2 két összekapcsolva"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "{0} kép áthelyezve"
-msgstr[1] "{0} kép áthelyezve"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "{0} kép elfordítva"
-msgstr[1] "{0} kép elfordítva"
-
-msgid "2 images unjoined"
-msgstr "2 kép szétválasztva"
-
-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 "minden, a látható területen"
-
-msgid "areas with downloaded OSM-data"
-msgstr "letöltött OSM-adatokat tartalmazó területek"
-
-msgid "only when manually requested"
-msgstr "csak kézi lekérésre"
-
-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 "Letöltés"
-
-msgid "Select mode"
-msgstr "Kijelölés mód"
-
-msgid "Mapillary login"
-msgstr "Mapillary bejelentkezés"
-
-msgid "Login successful, return to JOSM."
-msgstr "Bejelentkezés sikeres, vissza a JOSM-hez."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Támogatott képformátumok (JPG és PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "Mapillary képek letöltése"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Összes Mapillary kép: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr "Mapillary módosításcsomagok beküldése"
-
-msgid "No images found"
-msgstr "Nem található kép"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr "Sikeresen feltöltöttél {0} képet a mapillary.com-ra"
-
-msgid "Finished upload"
-msgstr "Feltöltés befejeződött"
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-"Nem vagy bejelentkezve. Kérlek jelentkezz be Mapillary-be a beállításokban"
-
-msgid "Not Logged in to Mapillary"
-msgstr "Nem vagy bejelentkezve Mapillary-be"
-
-msgid "Uploading: {0}"
-msgstr "Feltöltés: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -30947,6 +30492,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 ""
+"Ez az eszköz pontokat tud lecserélni, átalakítani vonallá vagy "
+"multipoligonná, valamint egy vonalat lecserélni másik vonalra."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "A pont vonal(ak)tól függ, nem lecserélhető."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr "A kapcsolat nem multipoligon, nem használható csereként."
+
+msgid "Replace geometry for node {0}"
+msgstr "{0} pont geometriájának lecserélése"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Kérlek válassz egy vonalat, ami már létezik az adatbázisban és egy új "
+"vonalat, aminek jó a geometriája."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr ""
+"A vonalaknak teljes egészében a letöltött területen belül kell lenniük."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"A lecserélendő vonalaknak nem lehet tulajdonsággal és kapcsolat tagsággal "
+"rendelkező pontjuk, hacsak nem tartoznak mindkét vonalhoz."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"A hatékony módszer elérte az iterációs határértéket, egyszerűbb módszer "
+"alkalmazva."
+
+msgid "Replace geometry for way {0}"
+msgstr "{0} vonal geometriájának lecserélése"
+
+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 ""
 
@@ -30980,9 +30632,30 @@ msgstr "Épületek címkéi:"
 msgid "Cannot place building outside of the world."
 msgstr "Nem helyezhetsz épületet a világon kívülre."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Épület rajzolása"
 
+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 "Épületek méretének beállítása"
 
@@ -30995,8 +30668,17 @@ msgstr "Épület automatikus kijelölése"
 msgid "Use address nodes under buildings"
 msgstr "Használja az épület alatti házszámokat"
 
-msgid "Buildings width:"
-msgstr "Épületek szélessége:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Hosszúság lépésköze:"
@@ -31691,6 +31373,18 @@ msgstr "Töröld a listából a kijelölt sémát."
 msgid "Color Schemes"
 msgstr "Színsémák"
 
+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 "Összevon"
 
@@ -32189,6 +31883,9 @@ msgstr "GeoChat panel megnyitása"
 msgid "Zoom in to see messages"
 msgstr "Nagyítás az üzenetek megtekintéséhez"
 
+msgid "Login"
+msgstr "Belépés"
+
 msgid "Enable autologin"
 msgstr "Automata beléptetés engedélyezése"
 
@@ -32221,24 +31918,15 @@ msgstr "Privát beszélgetés"
 msgid "Close tab"
 msgstr "Fül becsukása"
 
+msgid "Logout"
+msgstr "Kijelentkezés"
+
 msgid "Clear log"
 msgstr "Napló törlése"
 
 msgid "Show users on map"
 msgstr "Felhasználók mutatása a térképen"
 
-msgid "GeoJSON file"
-msgstr "GeoJSON fájl"
-
-msgid "Loading json file..."
-msgstr "JSON fájl betöltése…"
-
-msgid "Data Layer from GeoJSON: "
-msgstr "Adatréteg GeoJSON fájlból: "
-
-msgid "Error loading geojson file {0}"
-msgstr "Hiba történt a geojson fájl betöltése közben: {0}"
-
 msgid "Position only"
 msgstr "Csak pozíció"
 
@@ -32326,6 +32014,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr "Importálás"
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -33047,7 +32738,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"
@@ -33080,31 +32789,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"
@@ -34259,6 +34029,27 @@ msgstr "Ismeretlen fájlkiterjesztés: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "\"{0}\" fájl elemzése sikertelen"
 
+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"
 
@@ -34597,6 +34388,9 @@ msgstr "Fénykép GPS-adatok szerkesztése"
 msgid "Please select an image first."
 msgstr "Előbb válassz ki egy képet."
 
+msgid "No image selected"
+msgstr "Nincs kép kijelölve"
+
 msgid "(Empty values delete the according fields.)"
 msgstr "(Üres érték törli a mezőt.)"
 
@@ -35353,6 +35147,9 @@ msgstr ""
 msgid "State"
 msgstr "Állam"
 
+msgid "pending"
+msgstr "függőben"
+
 msgid "[incomplete]"
 msgstr "[befejezetlen]"
 
@@ -35775,12 +35572,6 @@ msgstr ""
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr "Kapcsolat nyitás a(z) {0} API-hoz megiúsult."
-
-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>"
@@ -36126,12 +35917,6 @@ msgstr ""
 msgid "Presets"
 msgstr "Előbeállítások"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr "Kiemelés"
 
@@ -37820,48 +37605,6 @@ msgstr ""
 "Ez az eszköz lecseréli egy objektum geometriáját egy másikra, ezért pontosan "
 "kettő kijelölt objektumra van szüksége."
 
-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 ""
-"Ez az eszköz pontokat tud lecserélni, átalakítani vonallá vagy "
-"multipoligonná, valamint egy vonalat lecserélni másik vonalra."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "A pont vonal(ak)tól függ, nem lecserélhető."
-
-msgid "Replace geometry for node {0}"
-msgstr "{0} pont geometriájának lecserélése"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr "A kapcsolat nem multipoligon, nem használható csereként."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Kérlek válassz egy vonalat, ami már létezik az adatbázisban és egy új "
-"vonalat, aminek jó a geometriája."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr ""
-"A vonalaknak teljes egészében a letöltött területen belül kell lenniük."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"A lecserélendő vonalaknak nem lehet tulajdonsággal és kapcsolat tagsággal "
-"rendelkező pontjuk, hacsak nem tartoznak mindkét vonalhoz."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"A hatékony módszer elérte az iterációs határértéket, egyszerűbb módszer "
-"alkalmazva."
-
-msgid "Replace geometry for way {0}"
-msgstr "{0} vonal geometriájának lecserélése"
-
 msgid "Replace Membership"
 msgstr "Kapcsolatok átadása"
 
@@ -37940,9 +37683,6 @@ msgstr "A vonal kijelölt két pontja közötti pontok kijelölése"
 msgid "Please select two nodes connected by way!"
 msgstr "Válassz ki két pontot, amiket vonal köt össze!"
 
-msgid "Too many ways are added: {0}!"
-msgstr ""
-
 msgid "All inside [testing]"
 msgstr ""
 
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index 84b0f49..2aecee2 100644
--- a/i18n/po/hy.po
+++ b/i18n/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2011-04-13 21:51+0000\n"
 "Last-Translator: Gev777 <Unknown>\n"
 "Language-Team: Armenian <hy at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 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: hy\n"
 
 msgid "Cancel"
@@ -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/ia.po b/i18n/po/ia.po
index 8726661..81dff56 100644
--- a/i18n/po/ia.po
+++ b/i18n/po/ia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2011-08-29 01:02+0000\n"
 "Last-Translator: Emilio Sepulveda <Unknown>\n"
 "Language-Team: Interlingua <ia at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:48+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:48+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: ia\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/id.po b/i18n/po/id.po
index 09258bf..ee817c2 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.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-21 09:17+0000\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-16 09:31+0000\n"
 "Last-Translator: Adhitya Dido Widyanto <Unknown>\n"
 "Language-Team: Indonesian <id at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:48+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:48+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: id\n"
 "X-Language: id_ID\n"
 
@@ -690,6 +690,8 @@ msgid ""
 "Some of the ways were part of relations that have been modified.<br>Please "
 "verify no errors have been introduced."
 msgstr ""
+"Beberapa garis merupakan bagian dari relasi yang telah "
+"dimodifikasi.<br>Mohon pastikan tidak ada kesalahan."
 
 msgid "Fix tag conflicts"
 msgstr "Perbaiki label yang konflik"
@@ -738,7 +740,7 @@ msgid "Move Node onto Way"
 msgstr "Pindahkan simpul ke jalan"
 
 msgid "Move the node onto the nearest way segments and include it"
-msgstr ""
+msgstr "Pindahkan titik ke segmen garus terdekat dan sertakan"
 
 msgid "No Shortcut"
 msgstr "Tidak ada jalan pintas"
@@ -1012,8 +1014,8 @@ msgstr "Masukkan URLuntuk didownload:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Masukkan sebuah URL dimana data seharusnya didownload"
 
-msgid "Separate Layer"
-msgstr "Memisahkan layer"
+msgid "Download as new layer"
+msgstr "Download sebagai layer baru"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Pilih jika data yang seharusnya didownload ke dalam layer baru"
@@ -1119,7 +1121,7 @@ msgid "Paste contents of clipboard."
 msgstr ""
 
 msgid "Paste at source position"
-msgstr ""
+msgstr "Tempel pada posisi sumber"
 
 msgid "Paste contents of clipboard at the position they were copied from."
 msgstr ""
@@ -1275,7 +1277,7 @@ msgstr ""
 "belum selesai juga."
 
 msgid "Non-branching way sequences"
-msgstr ""
+msgstr "Urutan jalan non-percabangan"
 
 msgid "Select non-branching sequences of ways"
 msgstr "Pilih rangkaian way/garis yang tidak bercabang"
@@ -1518,7 +1520,7 @@ msgid "Where should the tags of the node be put?"
 msgstr "Dimana seharusnya tag dari titik ini diletakkan?"
 
 msgid "Where should the memberships of this node be put?"
-msgstr ""
+msgstr "Dimana membership dari node ini sebaiknya diletakkan?"
 
 msgid "Unglued Node"
 msgstr "Node yang dilepas"
@@ -1878,6 +1880,8 @@ msgstr[0] "{0} catatan telah diunduh"
 msgid ""
 "Since the download limit was {0}, there might be more notes to download."
 msgstr ""
+"Karena batas unduh adalah {0}, kemungkinan masih ada catatan yang harus "
+"diunduh."
 
 msgid ""
 "Request a smaller area to make sure that all notes are being downloaded."
@@ -2136,10 +2140,10 @@ msgstr ""
 "Perbaiki (pe,pn) - arah garis snapping (e0,n0) - garis snapping yang asli"
 
 msgid "Dual alignment"
-msgstr ""
+msgstr "Penyelarasan ganda"
 
 msgid "Switch dual alignment mode while extruding"
-msgstr ""
+msgstr "Beralih ke mode penyelarasan ganda saat mengekstrusi"
 
 msgid "Extrude"
 msgstr "Tolak"
@@ -2160,7 +2164,7 @@ msgstr ""
 "persegi baru, klik ganda untuk menambah sebuah node baru"
 
 msgid "Dual alignment active."
-msgstr ""
+msgstr "Penyelarasan ganda aktif."
 
 msgid "Segment collapsed due to its direction reversing."
 msgstr ""
@@ -2173,6 +2177,7 @@ msgstr ""
 msgid ""
 "Move the node along one of the segments, then release the mouse button."
 msgstr ""
+"Pindahkan node sepanjang salah satu segmen, lalu lepaskan tombol mouse"
 
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
@@ -2392,29 +2397,29 @@ msgid "Confirmation"
 msgstr "Konfirmasi"
 
 msgid "Export GPX file starting from first member"
-msgstr ""
+msgstr "Ekspor file GPX dimulai dari anggota pertama"
 
 msgid "Export GPX file starting from last member"
-msgstr ""
+msgstr "Ekspor file GPX dimulia dari anggota terakhir"
 
 msgid "Convert to GPX layer starting from first member"
-msgstr ""
+msgstr "Konversi ke layer GPX  dimulai dari anggota pertama"
 
 msgid "Convert to GPX layer starting from last member"
-msgstr ""
+msgstr "Konversi ke layer GPX dimuali dari anggota pertama"
 
 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"
-msgstr ""
+msgstr "Relasi Terpilih"
 
 msgid "List of recent relations"
 msgstr "Daftar relasi terakhir"
@@ -2516,7 +2521,7 @@ msgid "Additional settings"
 msgstr "Pengaturan tambahan"
 
 msgid "Search syntax"
-msgstr ""
+msgstr "Cari syntax"
 
 msgid "Invalid search expression"
 msgstr "Ekspresi pencarian tidak berlaku"
@@ -2627,7 +2632,7 @@ msgid "object without useful tags"
 msgstr "objek tanpa tag berguna"
 
 msgid "all objects that use the address preset"
-msgstr ""
+msgstr "seluruh objek yang menggunakan preset alamat"
 
 msgid "all objects that use any preset under the Geography/Nature group"
 msgstr "Seluruh objek yang menggunakan preset di bawah grup Geografi/Alami"
@@ -2802,7 +2807,7 @@ msgid "Cycling dependencies"
 msgstr "Mensikluskan ketergantungan"
 
 msgid "Uploading modified notes"
-msgstr ""
+msgstr "Mengunggah notes perubahan"
 
 msgid "Note {0} failed: {1}"
 msgstr "Note{0} gagal:{1}"
@@ -2859,7 +2864,7 @@ msgid_plural "Added {0} objects"
 msgstr[0] "Menambahkan {0} objek"
 
 msgid "New way {0} has 0 nodes"
-msgstr ""
+msgstr "Way baru {0} memiliki 0 node"
 
 msgid "Change node {0}"
 msgstr "Ubah node/titik {0}"
@@ -3097,6 +3102,8 @@ msgid ""
 "When reversing this way, the following changes are suggested in order to "
 "maintain data consistency."
 msgstr ""
+"Ketika membalikan way, perubahan berikut disarankan untuk menjaga "
+"konsistensi data."
 
 msgid "Apply selected changes"
 msgstr "Terapkan perubahan yang dipilih"
@@ -3156,6 +3163,8 @@ msgid ""
 "Failed to initialize preferences. Failed to create missing preference "
 "directory: {0}"
 msgstr ""
+"Gagal menginisialisasi preferensi. Gagal membuat direktori preferensi yang "
+"hilang: {0}"
 
 msgid ""
 "<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3166,10 +3175,12 @@ msgstr ""
 
 msgid "Missing preference file ''{0}''. Creating a default preference file."
 msgstr ""
+"File preferensi yang hilang '' {0} ''. Membuat file preferensi default"
 
 msgid ""
 "Replacing existing preference file ''{0}'' with default preference file."
 msgstr ""
+"Mengganti file preferensi yang ada '' {0} '' dengan file preferensi default"
 
 msgid ""
 "<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3189,6 +3200,8 @@ msgid ""
 "Failed to initialize preferences. Failed to reset preference file to "
 "default: {0}"
 msgstr ""
+"Gagal memasang preferensi. Gagal memasang kembali preferensi file ke "
+"default: {0}"
 
 msgid "Failed to load defaults cache file: {0}"
 msgstr ""
@@ -3203,7 +3216,7 @@ msgid "Paint style {0}: {1}"
 msgstr "Gaya Gambar {0}: {1}"
 
 msgid "Failed to persist preferences to ''{0}''"
-msgstr ""
+msgstr "Gagal mempertahankan preferensi untuk ''{0}''"
 
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Pengaturan pilihan {0} telah dihapus sejak tidak dipakai lagi"
@@ -3244,7 +3257,7 @@ msgid "Unexpected JOSM version number in revision file, value is ''{0}''"
 msgstr ""
 
 msgid "The revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "Berkas revisi ''/ REVISION'' hilang"
 
 msgid "Already registered a conflict for primitive ''{0}''."
 msgstr "Telah meregistrasi sebuah konflik untuk primitif \"{0}\"."
@@ -3285,6 +3298,7 @@ msgstr "Tanggal citra: {0}"
 
 msgid "This imagery is marked as best in this region in other editors."
 msgstr ""
+"Citra ini ditandai sebagai yang terbaik di wilayah ini di editor lain."
 
 msgid "{0} mirror server {1}"
 msgstr "{0} mirror server {1}"
@@ -3332,7 +3346,7 @@ msgid "Matrix set identifier"
 msgstr ""
 
 msgid "No default layer selected, choosing first layer."
-msgstr ""
+msgstr "Tidak ada layer default yang dipilih, pilih layer pertama."
 
 msgid "No layers defined by getCapabilities document: {0}"
 msgstr ""
@@ -3626,7 +3640,7 @@ msgstr ""
 "node, jalur, atau hubungan"
 
 msgid "Positive integer expected"
-msgstr ""
+msgstr "Bilangan bulat positif diharapkan"
 
 msgid "Range of numbers expected"
 msgstr "Jarak pada angka diharapkan"
@@ -3831,10 +3845,10 @@ msgid "Checks for missing tag or suspicious combinations"
 msgstr "Periksa untuk missing tag atau suspicious combinations"
 
 msgid "Deprecated features"
-msgstr ""
+msgstr "Fitur usang"
 
 msgid "Checks for deprecated features"
-msgstr ""
+msgstr "Periksa fitur yang sudah usang"
 
 msgid "Geometry"
 msgstr "Geometri"
@@ -3873,7 +3887,7 @@ msgid "Checks for errors on relations"
 msgstr "Memeriksa kesalahan pada relasi"
 
 msgid "Territories"
-msgstr ""
+msgstr "Wilayah"
 
 msgid "Checks for territories-specific features"
 msgstr ""
@@ -3897,7 +3911,7 @@ msgid "Expected integer value in range 1-60 for ''+zone=...'' parameter."
 msgstr ""
 
 msgid "No unit found for: {0}"
-msgstr ""
+msgstr "Satuan tidak ditemukan untuk: {0}"
 
 msgid "Unknown parameter: ''{0}''."
 msgstr "Parameter tidak diketahui: \"{0}\"."
@@ -3996,7 +4010,7 @@ msgid "Switch order of input coordinates (east/north, lon/lat)"
 msgstr ""
 
 msgid "Switch order of output coordinates (east/north, lon/lat)"
-msgstr ""
+msgstr "Ubah output koordinat (timur/utara, bujur/lintang)"
 
 msgid "<crs>"
 msgstr "<crs>"
@@ -4077,7 +4091,7 @@ msgid "Polar Stereographic: Parameter ''{0}'' must be 90 or -90."
 msgstr ""
 
 msgid "Sinusoidal"
-msgstr ""
+msgstr "Sinusoidal"
 
 msgid "Swiss Oblique Mercator"
 msgstr "Swiss Oblique Mercator"
@@ -4111,7 +4125,7 @@ msgid "E-mail address contains an invalid username: {0}"
 msgstr "Alamat surat elektronik memuat nama pengguna yang salah: {0}"
 
 msgid "E-mail address contains an invalid domain: {0}"
-msgstr ""
+msgstr "Alamat e-mail mengandung domain yang tidak valid: {0}"
 
 msgid "Email validator"
 msgstr ""
@@ -4217,7 +4231,7 @@ msgid "{0} is not a valid restriction value"
 msgstr ""
 
 msgid "Wrong syntax in {0} key"
-msgstr ""
+msgstr "Kesalahan syntax dalam {0} key"
 
 msgid "Error in {0} value: {1}"
 msgstr "Kesalahan pada {0} nilai: {1}"
@@ -4241,10 +4255,10 @@ msgid "Crossing barriers"
 msgstr "Pembatas berpotongan"
 
 msgid "Self crossing"
-msgstr ""
+msgstr "Berpotongan"
 
 msgid "Self-crossing ways"
-msgstr ""
+msgstr "Garis berpotongan"
 
 msgid ""
 "This test checks if two roads, railways, waterways or buildings crosses in "
@@ -4341,7 +4355,7 @@ msgid "Highway link is not linked to adequate highway/link"
 msgstr ""
 
 msgid "Missing pedestrian crossing information"
-msgstr ""
+msgstr "Informasi penyeberangan pejalan kaki yang tidak ada"
 
 msgid "Unknown country code: {0}"
 msgstr "Kode negara tidak diketahui: {0}"
@@ -4350,7 +4364,7 @@ msgid "Unknown source:maxspeed context: {0}"
 msgstr ""
 
 msgid "Internet tags"
-msgstr ""
+msgstr "Tag internet"
 
 msgid "Checks for errors in internet-related tags."
 msgstr ""
@@ -4359,13 +4373,13 @@ msgid "''{0}'': {1}"
 msgstr "\"{0}\": {1}"
 
 msgid "Lane tags"
-msgstr ""
+msgstr "Tag jalur"
 
 msgid "Test that validates ''lane:'' tags."
 msgstr ""
 
 msgid "Number of {0} greater than {1}"
-msgstr ""
+msgstr "Nomer {0} lebih besar dari {1}"
 
 msgid "{0}+{1}"
 msgstr "{0}+{1}"
@@ -4380,13 +4394,13 @@ msgid "Number of lane dependent values inconsistent in backward direction"
 msgstr ""
 
 msgid "Long segments"
-msgstr ""
+msgstr "Segmen panjang"
 
 msgid "This tests for long way segments, which are usually errors."
 msgstr ""
 
 msgid "Very long segment of {0} kilometers"
-msgstr ""
+msgstr "Segmen sangat panjang {0} kilometer"
 
 msgid "Tag checker (MapCSS based)"
 msgstr ""
@@ -4404,7 +4418,7 @@ msgid " or "
 msgstr " atau "
 
 msgid "{0}, use {1} instead"
-msgstr ""
+msgstr "{0}, sebagai gantinya gunakan {1}"
 
 msgid "Adding {0} to tag checker"
 msgstr ""
@@ -4422,20 +4436,20 @@ msgid "Area style way is not closed"
 msgstr "Model area garis tidak menutup"
 
 msgid "No outer way for boundary"
-msgstr ""
+msgstr "Tidak ada garis luar untuk batas"
 
 msgid "No outer way for multipolygon"
 msgstr "Tidak ada garis terluar untuk multipoligon"
 
 msgid "No area style for multipolygon"
-msgstr ""
+msgstr "Tidak ada gaya area untuk multipoligon"
 
 msgid ""
 "Multipolygon relation should be tagged with area tags and not the outer way"
 msgid_plural ""
 "Multipolygon relation should be tagged with area tags and not the outer ways"
 msgstr[0] ""
-msgstr[1] ""
+"Relasi multipoligon harus ditandai dengan tag area dan bukan garis luarnya"
 
 msgid ""
 "With the currently used mappaint style the style for inner way equals the "
@@ -4469,7 +4483,7 @@ msgid "Multipolygon rings are equal"
 msgstr ""
 
 msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
+msgstr "Role untuk \"{0}\" sebaiknya \"{1}\""
 
 msgid "Multipolygon inner way is outside"
 msgstr "Garis terdalam multipoligon di luar"
@@ -4575,7 +4589,7 @@ msgid "Overlapping railways"
 msgstr "Pertampalan rel kereta"
 
 msgid "Way contains segment twice"
-msgstr ""
+msgstr "Way mengandung segmen dua kali"
 
 msgid "Power lines"
 msgstr "Saluran listrik"
@@ -4639,7 +4653,7 @@ msgid "Empty role type found when expecting one of ''{0}''"
 msgstr ""
 
 msgid "Role ''{0}'' missing"
-msgstr ""
+msgstr "Role \"{0}\" hilang"
 
 msgid "Number of ''{0}'' roles too low ({1})"
 msgstr ""
@@ -4735,7 +4749,7 @@ msgid "Misspelled property value"
 msgstr "Salah pengejaan nilai properti"
 
 msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr ""
+msgstr "Value \"{0}\" untuk key \"{1}\" mirip seperti \"{2}\""
 
 msgid "Presets do not contain property value"
 msgstr "Preset tidak berisi nilai properti"
@@ -5029,7 +5043,7 @@ msgid "Illegal Data"
 msgstr "Data ilegal"
 
 msgid "Offline mode"
-msgstr ""
+msgstr "Mode offline"
 
 msgid "Internal Server Error"
 msgstr "Kesalahan Server Internal"
@@ -5172,6 +5186,7 @@ msgstr "perintah"
 
 msgid "launch JOSM (default, performed when no command is specified)"
 msgstr ""
+"luncurkan JOSM (default, dilakukan bila tidak ada perintah yang ditentukan)"
 
 msgid "render data and save the result to an image file"
 msgstr ""
@@ -5254,19 +5269,19 @@ msgid "Set the preferences directory"
 msgstr "Atur preferensi direktori"
 
 msgid "Default: {0}"
-msgstr ""
+msgstr "Default: {0}"
 
 msgid "/PATH/TO/JOSM/USERDATA"
 msgstr ""
 
 msgid "Set the user data directory"
-msgstr ""
+msgstr "Tetapkan direktori data pengguna"
 
 msgid "/PATH/TO/JOSM/CACHE   "
 msgstr ""
 
 msgid "Set the cache directory"
-msgstr ""
+msgstr "Atur direktori singgahan"
 
 msgid "/PATH/TO/JOSM/HOMEDIR "
 msgstr ""
@@ -5350,11 +5365,13 @@ msgid ""
 msgid_plural ""
 "JOSM is running in offline mode. These resources will not be available: {0}"
 msgstr[0] ""
-msgstr[1] ""
+"JOSM sedang berjalan dalam mode offline. Sumber ini tidak tersedia: {0}"
 
 msgid ""
 "Detected useable IPv6 network, prefering IPv6 over IPv4 after next restart."
 msgstr ""
+"Terdeteksi menggunakan jaringan IPv6, menyarankan IPv6 dibandingkan IPv4 "
+"setelah muat ulang (restart) berikutnya."
 
 msgid "Detected useable IPv6 network, prefering IPv6 over IPv4."
 msgstr ""
@@ -5418,7 +5435,7 @@ msgstr "Klik disini untuk melihat kotak masuk Anda."
 
 msgctxt "menu"
 msgid "File"
-msgstr ""
+msgstr "File"
 
 msgctxt "menu"
 msgid "Edit"
@@ -5438,36 +5455,36 @@ msgstr ""
 
 msgctxt "menu"
 msgid "Data"
-msgstr ""
+msgstr "Data"
 
 msgctxt "menu"
 msgid "Selection"
-msgstr ""
+msgstr "Pilihan"
 
 msgctxt "menu"
 msgid "Presets"
-msgstr ""
+msgstr "Preset"
 
 msgid "More..."
 msgstr "Selebihnya..."
 
 msgctxt "menu"
 msgid "GPS"
-msgstr ""
+msgstr "GPS"
 
 msgctxt "menu"
 msgid "Windows"
-msgstr ""
+msgstr "Jendela"
 
 msgctxt "menu"
 msgid "Help"
-msgstr ""
+msgstr "Bantuan"
 
 msgid "Menu: {0}"
 msgstr "Menu: {0}"
 
 msgid "Main toolbar"
-msgstr ""
+msgstr "Toolbar utama"
 
 msgid ""
 "Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
@@ -5483,13 +5500,13 @@ msgid "Preset preferences"
 msgstr "Preferensi preset"
 
 msgid "Click to open the tagging presets tab in the preferences"
-msgstr ""
+msgstr "Klik untuk membuka tab tagging preset dalam preferensi"
 
 msgid "Imagery preferences"
 msgstr "Preferensi citra"
 
 msgid "Click to open the imagery tab in the preferences"
-msgstr ""
+msgstr "Klik untuk membuka tab citra satelit di dalam preferensi"
 
 msgctxt "menu"
 msgid "Audio"
@@ -5590,7 +5607,7 @@ msgid "The geographic longitude at the mouse pointer."
 msgstr "Garis bujur geografis pada penunjuk mouse."
 
 msgid "System of measurement changed to {0}"
-msgstr ""
+msgstr "Sistem pengukuran berubah menjadi {0}"
 
 msgid "Default (open, closed, new)"
 msgstr ""
@@ -5732,7 +5749,7 @@ msgid "Include the system status report."
 msgstr ""
 
 msgid "Include information about the data you were working on."
-msgstr ""
+msgstr "Termasuk informasi tentang data yang sedang Anda kerjakan."
 
 msgid "Include all stack traces."
 msgstr ""
@@ -5987,7 +6004,7 @@ msgid "Up"
 msgstr "Atas"
 
 msgid "Move up the selected entries by one position."
-msgstr ""
+msgstr "Pindahkan masukan terpilih satu posisi ke atas"
 
 msgid "Down"
 msgstr "Bawah"
@@ -6257,7 +6274,11 @@ msgid_plural ""
 "are shown a dialog to decide how to adapt the relations.<br/><br/>Do you "
 "want to continue?"
 msgstr[0] ""
-msgstr[1] ""
+"Anda akan menggabungkan {1} objek, yang merupakan bagian dari {0} "
+"relasi:<br/>{2}Menggabungkan objek ini akan memutuskan relasi. Jika Anda "
+"tidak yakin, silakan batalkan operasi ini.<br/>Jika Anda ingin melanjutkan, "
+"Anda akan diperlihatkan kotak dialog untuk menentukan bagaimana cara "
+"menyesuaikan relasinya. <br/><br/>Apakah Anda ingin melanjutkan?"
 
 msgid "Combine confirmation"
 msgstr "Gabungan konfirmasi"
@@ -6394,7 +6415,7 @@ msgid "Key:"
 msgstr "Key:"
 
 msgid "<html>Enter a tag key, e.g. <strong><tt>fixme</tt></strong></html>"
-msgstr ""
+msgstr "<html>Masukkan tag key, e.g. <strong><tt>fixme</tt></strong></html>"
 
 msgid "Value:"
 msgstr "Value"
@@ -6402,6 +6423,7 @@ msgstr "Value"
 msgid ""
 "<html>Enter a tag value, e.g. <strong><tt>check members</tt></strong></html>"
 msgstr ""
+"<html>Masukkan tag value, e.g. <strong><tt>check members</tt></strong></html>"
 
 msgid ""
 "<html>The combined ways are members in one or more relations. Please decide "
@@ -6825,7 +6847,7 @@ msgid "Tags: "
 msgstr "Tag: "
 
 msgid "Centroid: "
-msgstr ""
+msgstr "Centroid: "
 
 msgid "{0} Member: "
 msgid_plural "{0} Members: "
@@ -7417,6 +7439,7 @@ msgid ""
 "Download the current version of the changed objects in the selected "
 "changesets"
 msgstr ""
+"Download versi terbaru dari objek yang berubah pada changeset yang dipilih"
 
 msgid "My changesets"
 msgstr "Set perubahan saya"
@@ -7960,7 +7983,7 @@ msgid_plural ", {0} unset"
 msgstr[0] ", {0} belum diatur"
 
 msgid "Select objects for which to change tags."
-msgstr ""
+msgstr "Pilih objek untuk mengubah tag."
 
 msgid "Tags/Memberships"
 msgstr "Tags/Memberships"
@@ -8075,7 +8098,7 @@ msgid "Replace"
 msgstr "Gantikan"
 
 msgid "The new key is already used, overwrite values?"
-msgstr ""
+msgstr "Key baru telah digunakan, gantikan nilai?"
 
 msgid "Change value?"
 msgid_plural "Change values?"
@@ -8127,7 +8150,7 @@ msgid "Hide"
 msgstr "Sembunyikan"
 
 msgid "Refresh recent tags list after applying tag"
-msgstr ""
+msgstr "Perbarui daftar tag terbaru setelah menerapkan tag"
 
 msgid "No refresh"
 msgstr ""
@@ -8136,10 +8159,10 @@ msgid "Refresh tag status only (enabled / disabled)"
 msgstr ""
 
 msgid "Refresh tag status and list of recently added tags"
-msgstr ""
+msgstr "Perbarui status tag dan daftar tag yang baru ditambahkan"
 
 msgid "to apply first suggestion"
-msgstr ""
+msgstr "untuk menerapkan saran pertama"
 
 msgid "to add without closing the dialog"
 msgstr "untuk menambahkan tanpa menutup dialog"
@@ -8178,7 +8201,7 @@ msgid "Edit ignore list"
 msgstr "Edit daftar abai"
 
 msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
-msgstr ""
+msgstr "Anda mengubah value ''{0}'' dari ''{1}'' menjadi ''{2}''."
 
 msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
@@ -8449,7 +8472,7 @@ msgid "Relation Editor: Refresh"
 msgstr ""
 
 msgid "Refresh relation from data layer"
-msgstr ""
+msgstr "Perbarui relasi dari layer data"
 
 msgid "Refresh"
 msgstr "Perbaharui"
@@ -8602,7 +8625,7 @@ msgid "Wrong number of arguments for bookmark"
 msgstr "Jumlah argumen untuk bookmark salah"
 
 msgid "Home location"
-msgstr ""
+msgstr "Lokasi utama"
 
 msgid "Error reading bookmark entry: %s"
 msgstr "Terdapat kesalahan saat membaca penanda yang dimasukkan: %s"
@@ -8681,9 +8704,6 @@ msgstr "Nilai dari lintang memiliki interval [-90,90] yang dibutuhkan"
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Nilai dari bujur harus terletak pada interval [-180,180]"
 
-msgid "Download as new layer"
-msgstr "Download sebagai layer baru"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9323,6 +9343,8 @@ msgid ""
 "A background upload is already in progress. Kindly wait for it to finish "
 "before uploading new changes"
 msgstr ""
+"Proses unggah sebelumnya masih berjalan. Harap menunggu hingga selesai "
+"sebelum mengunggah perubahan baru"
 
 msgid "I would like someone to review my edits."
 msgstr "Saya ingin seseorang untuk memeriksa perubahan yang saya buat"
@@ -9817,7 +9839,7 @@ msgstr ""
 "Pemeta yang lainnya."
 
 msgid "Please specify a changeset source"
-msgstr ""
+msgstr "Mohon tentukan sumber changeset"
 
 msgid ""
 "You did not specify a source for your changes.<br />It is technically "
@@ -9825,6 +9847,10 @@ msgid ""
 "origins of the data.<br /><br />If you spend a minute now to explain your "
 "change, you will make life<br />easier for many other mappers."
 msgstr ""
+"Anda tidak merincikan sumber dari perubahan Anda.<br />Hal ini "
+"diperbolehkan, namun informasi ini akan membantu<br />pengguna lain untuk "
+"mengerti asal usul data.<br /><br />Jika Anda meluangkan waktu sejenak untuk "
+"mendeskripsikan perubahan Anda, Anda akan membantu<br />para pemeta lain."
 
 msgid "Revise"
 msgstr "Revisi"
@@ -9855,7 +9881,8 @@ msgid_plural ""
 "<html>The following changeset tags contain an empty "
 "key/value:<br>{0}<br>Continue?</html>"
 msgstr[0] ""
-msgstr[1] ""
+"<html>Changeset berikut mengandung key/value "
+"kosong:<br>{0}<br>Lanjutkan?</html>"
 
 msgid "Empty metadata"
 msgstr "Metadata kosong"
@@ -10241,7 +10268,7 @@ msgid "NMEA import failure!"
 msgstr "import NMEA gagal"
 
 msgid "Note Files"
-msgstr ""
+msgstr "File Catatan"
 
 msgid "OSM Server Files bzip2 compressed"
 msgstr "Berkas server OSM bzip2 terkompres"
@@ -10287,9 +10314,12 @@ msgstr "Tidak ada data yang ditemukan pada berkas \"{0}\"."
 msgid "Open OSM file"
 msgstr "Buka berkas OSM"
 
-msgid "Validation Error Files"
+msgid "OSM Server Files XZ compressed"
 msgstr ""
 
+msgid "Validation Error Files"
+msgstr "File Kesalahan Validasi"
+
 msgid "WMS Files (*.wms)"
 msgstr "Berkas WMS  (*.wms)"
 
@@ -10297,7 +10327,7 @@ msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "tidak mendukung file WMS versi; ditemukan {0}, diharapkan {1}"
 
 msgid "Native projections"
-msgstr ""
+msgstr "Proyeksi asil"
 
 msgid "Offset"
 msgstr "Pergeseran"
@@ -10467,7 +10497,7 @@ msgid "Length"
 msgstr "Panjang"
 
 msgid "Number of<br/>Segments"
-msgstr ""
+msgstr "Jumlah<br/>Segmen"
 
 msgid "Length: {0}"
 msgstr "Panjang: {0}"
@@ -10486,17 +10516,17 @@ msgstr[0] "{0} jalur"
 
 msgid " ({0} segment)"
 msgid_plural " ({0} segments)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] " ({0} segmen)"
 
 msgid "Save GPX file"
 msgstr "Simpan file GPX"
 
 msgid "Collect segments of all tracks and combine in a single track."
 msgstr ""
+"Kumpulkan segmen untuk seluruh jalur dan gabungkan ke dalam satu jalur"
 
 msgid "Combine tracks of this layer"
-msgstr ""
+msgstr "Gabungkan track dari layer ini"
 
 msgid "Split multiple track segments of one track into multiple tracks."
 msgstr ""
@@ -10538,7 +10568,7 @@ msgid "All projections are supported"
 msgstr "Semua proyeksi didukung"
 
 msgid "The layer {0} does not support the new projection {1}."
-msgstr ""
+msgstr "Lapisan {0} tidak mendukung proyeksi baru {1}."
 
 msgid "Supported projections are: {0}"
 msgstr "Proyeksi yang didukung adalah: {0}"
@@ -10604,7 +10634,7 @@ msgid "Upload is discouraged"
 msgstr "Upload tidak disarankan"
 
 msgid "Upload is blocked"
-msgstr ""
+msgstr "Unggah diblok"
 
 msgid "Convert to GPX layer"
 msgstr "Mengkonversi ke layer GPX"
@@ -10914,7 +10944,7 @@ msgid "Show previous Image"
 msgstr "Tujukkan gambar sebelumnya"
 
 msgid "Show first Image"
-msgstr ""
+msgstr "Tampilkan gambar pertama."
 
 msgid "Show last Image"
 msgstr "Tampilkan gambar terakhir"
@@ -11294,7 +11324,7 @@ msgid ""
 msgstr ""
 
 msgid "In option {0}: {1}"
-msgstr ""
+msgstr "Dalam opsi {0}: {1}"
 
 msgid "Expected floating point number > 0 for option {0}, but got ''{1}''"
 msgstr ""
@@ -11478,10 +11508,10 @@ msgid "Authorize URL:"
 msgstr "Izin URL"
 
 msgid "OSM login URL:"
-msgstr ""
+msgstr "OSM login URL:"
 
 msgid "OSM logout URL:"
-msgstr ""
+msgstr "OSM logout URL:"
 
 msgid "Click to reset the OAuth settings to default values"
 msgstr "Klik untuk mengatur ulang pengaturan ke nilai standar OAuth"
@@ -12545,7 +12575,7 @@ msgstr "Pejalan Kaki"
 
 msgctxt "Heat map"
 msgid "User Normal"
-msgstr ""
+msgstr "Pengguna Normal"
 
 msgctxt "Heat map"
 msgid "User Light"
@@ -12778,12 +12808,14 @@ msgstr ""
 "Tampilan tombol pada sisi kanan menu ketika mouse berada didalam elemen"
 
 msgid "ISO 8601"
-msgstr ""
+msgstr "ISO 8601"
 
 msgid ""
 "Format dates according to {0}. Today''s date will be displayed as {1} "
 "instead of {2}"
 msgstr ""
+"Format tanggal berdasarkan kepada {0}. Tanggal hari ini akan ditampilkan "
+"sebagai {1} dan bukan {2}"
 
 msgid ""
 "Use file choosers that behave more like native ones. They look nicer but do "
@@ -12902,7 +12934,7 @@ msgid "Cache name"
 msgstr "Nama cache"
 
 msgid "Object Count"
-msgstr ""
+msgstr "Hitungan Objek"
 
 msgid "Soft"
 msgstr "Lembut"
@@ -13488,10 +13520,10 @@ msgid "Set as default"
 msgstr ""
 
 msgid "Default projection"
-msgstr ""
+msgstr "Proyeksi default"
 
 msgid "Default projection has been set to ''{0}''"
-msgstr ""
+msgstr "Proyeksi default telah ditetapkan ke \"{0}\""
 
 msgid "Display coordinates as"
 msgstr "Tampilan koordinat sebagai"
@@ -13562,9 +13594,6 @@ msgstr "Remote kontrol"
 msgid "Settings for the remote control feature."
 msgstr "Pengaturan fitur remote kontrol"
 
-msgid "Download objects to new layer"
-msgstr "Download objek pada layer baru"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "memastikan semua remote kontrol terkendali secara manual"
 
@@ -13600,22 +13629,22 @@ msgid ""
 msgstr ""
 
 msgid "Certificate:"
-msgstr ""
+msgstr "Sertifikat"
 
 msgid "Certificate has been successfully installed."
 msgstr "Sertifikat telah sukses dipasang."
 
 msgid "Certificate is already installed. Nothing to do."
-msgstr ""
+msgstr "Sertifikat telah terpasang. Tidak ada yang perlu dilakukan."
 
 msgid "Removing certificate {0} from root keystore."
 msgstr ""
 
 msgid "Certificate has been successfully uninstalled."
-msgstr ""
+msgstr "Sertifikat telah berhasil dicopot."
 
 msgid "Certificate is not installed. Nothing to do."
-msgstr ""
+msgstr "Sertifikat tidak terpasang. Tidak ada yang perlu dilakukan."
 
 msgid "Permitted actions:"
 msgstr "Tindakan mengizinkan"
@@ -14018,7 +14047,7 @@ msgid "Change Tags"
 msgstr "Ubah Tag"
 
 msgid "Add or remove toolbar button"
-msgstr ""
+msgstr "Tambahkan atau hilangkan tombol toolbar"
 
 msgid "Unknown type: {0}"
 msgstr "Tipe tidak diketahui : {0}"
@@ -14993,7 +15022,7 @@ msgid "The minima must be less than the maxima"
 msgstr ""
 
 msgid "Remote Control has been asked to load the following data:"
-msgstr ""
+msgstr "Remote Control telah diminta untuk memuat data berikut:"
 
 msgid "Loading data"
 msgstr "Memuat data"
@@ -15011,16 +15040,16 @@ msgid "Do you want to allow this?"
 msgstr "Apakah anda ingin mengikuti ini?"
 
 msgid "Yes, always"
-msgstr ""
+msgstr "Ya, selalu"
 
 msgid "Yes, once"
-msgstr ""
+msgstr "Ya, sekali"
 
 msgid "Confirm Remote Control action"
 msgstr "Konfirmasi tindakan remote kontrol"
 
 msgid "The following keys are mandatory, but have not been provided: {0}"
-msgstr ""
+msgstr "Key berikut bersifat wajib, namun belum tersedia: {0}"
 
 msgid ""
 "Remote Control has been asked to report its protocol version. This enables "
@@ -15051,7 +15080,7 @@ msgid "Include OSM data in the .joz session file."
 msgstr "Termasuk data OSM pada .joz berkas sesi."
 
 msgid "Link to a GPX data file on your local disk."
-msgstr ""
+msgstr "Sambungkan ke file data GPX di penyimpanan lokal Anda."
 
 msgid "Include GPX data in the .joz session file."
 msgstr ""
@@ -15166,7 +15195,7 @@ msgid "Failed to create missing plugin preferences directory: {0}"
 msgstr ""
 
 msgid "Failed to create missing plugin user data directory: {0}"
-msgstr ""
+msgstr "Gagal membuat direktori data pengguna plugin yang hilang: {0}"
 
 msgid "Failed to create missing plugin cache directory: {0}"
 msgstr ""
@@ -15190,11 +15219,15 @@ msgid ""
 "Cannot download plugin ''{0}''. Its download link is not known. Skipping "
 "download."
 msgstr ""
+"Tidak dapat mengunduh plugin \"{0}\". Link unduh tidak diketahui. Lewati "
+"mengunduh."
 
 msgid ""
 "Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid "
 "URL. Skipping download."
 msgstr ""
+"Tidak dapat mengunduh plugin \"{0}\". Link unduh \"{1}\" tidak valid. Lewati "
+"mengunduh."
 
 msgid "Failed to create plugin directory ''{0}''"
 msgstr "Gagal untuk membuat daftar plugin ''{0}''"
@@ -15300,8 +15333,7 @@ msgstr "Unduh dan muat ulang"
 
 msgid "Click to download missing plugin and restart JOSM"
 msgid_plural "Click to download missing plugins and restart JOSM"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Klik untuk download plugins yang hilang dan mulai ulang JOSM"
 
 msgid "Click to continue without this plugin"
 msgid_plural "Click to continue without these plugins"
@@ -15388,6 +15420,11 @@ msgstr "Simpan plugin"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Klik untuk menyimpan plugin ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Gagal untuk install plugin \"{0}\" dari file download sementara \"{1}\".{2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Gagal menghapus plugin yang sudah usang \"{0}\""
 
@@ -15399,10 +15436,6 @@ msgstr ""
 "JOSM tetap akan memuat plugin versi lama."
 
 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 ""
@@ -15795,7 +15828,7 @@ msgstr ""
 "dan/atau tidak konsisten.<br><br>Rincian (tidak diterjemahkan): {0}</html>"
 
 msgid "<html>Failed to download data.<br><br>Details: {0}</html>"
-msgstr ""
+msgstr "<html>Gagal mengunduh data.<br><br>Details: {0}</html>"
 
 msgid ""
 "<html>The OSM server<br>''{0}''<br>reported an internal server "
@@ -15979,7 +16012,7 @@ msgid "Unable to delete file {0}"
 msgstr "Tidak dapat menghapus file {0}"
 
 msgid "Unable to create directory {0}"
-msgstr ""
+msgstr "Tidak dapat membuat direktori {0}"
 
 msgid "ms"
 msgstr "ms"
@@ -16120,7 +16153,7 @@ msgstr ""
 
 msgctxt "landuse"
 msgid "vineyard"
-msgstr ""
+msgstr "kebun anggur"
 
 msgctxt "natural"
 msgid "scrub"
@@ -16460,7 +16493,7 @@ msgid "Thin Rollers: rollerblade, skateboard"
 msgstr ""
 
 msgid "good"
-msgstr ""
+msgstr "baik"
 
 msgid "Thin Wheels: racing bike"
 msgstr ""
@@ -16493,7 +16526,7 @@ msgid "very_horrible"
 msgstr ""
 
 msgid "Specialized off-road: tractor, ATV"
-msgstr ""
+msgstr "Spesialis kendaraan off-road: traktor, ATV"
 
 msgid "impassable"
 msgstr "tidak dapat dilewati"
@@ -16582,7 +16615,7 @@ msgid "Width (meters)"
 msgstr "Lebar (meter)"
 
 msgid "Sidewalk"
-msgstr ""
+msgstr "Trotoar"
 
 msgctxt "sidewalk"
 msgid "both"
@@ -16636,7 +16669,7 @@ msgstr "ya"
 
 msgctxt "electrified"
 msgid "rail"
-msgstr ""
+msgstr "rel"
 
 msgid "Voltage in Volts (V)"
 msgstr ""
@@ -17074,7 +17107,7 @@ msgstr ""
 
 msgctxt "parking"
 msgid "surface"
-msgstr ""
+msgstr "permukaan"
 
 msgctxt "parking"
 msgid "underground"
@@ -17172,21 +17205,23 @@ msgid "deciduous"
 msgstr "gugur"
 
 msgid "Plants that are leafless for a certain period during the year."
-msgstr ""
+msgstr "tanaman yang gundul untuk beberapa saat dalam satu tahun."
 
 msgid "evergreen"
-msgstr ""
+msgstr "hijau sepanjang tahun"
 
 msgid "Plants that are never entirely without green foliage."
 msgstr ""
 
 msgid "semi_deciduous"
-msgstr ""
+msgstr "semi_gugur"
 
 msgid ""
 "Plants that lose their foliage for a very short period, when old leaves fall "
 "off and new foliage growth is starting."
 msgstr ""
+"Tanaman yang kehilangan dedaunan mereka dalam waktu yang sangat singkat, "
+"saat daun tua jatuh dan tumbuh dedaunan baru."
 
 msgid "semi_evergreen"
 msgstr ""
@@ -17296,10 +17331,10 @@ msgid "sunni"
 msgstr "sunni"
 
 msgid "750000;200000"
-msgstr ""
+msgstr "750000;200000"
 
 msgid "110000;20000"
-msgstr ""
+msgstr "110000;20000"
 
 msgid "Branch operator"
 msgstr ""
@@ -17308,7 +17343,7 @@ msgid "Amount of Cables"
 msgstr "Jumlah Kabel"
 
 msgid "Amount of circuits"
-msgstr ""
+msgstr "Jumlah sirkuit"
 
 msgid "Location"
 msgstr "Lokasi"
@@ -17333,15 +17368,11 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "atap"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
-msgstr ""
+msgstr "Tanggal awal"
 
 msgid "Output forms of energy:"
-msgstr ""
+msgstr "Bentuk keluaran energi:"
 
 msgid "biogas"
 msgstr "biogas"
@@ -17389,7 +17420,7 @@ msgid "plastic"
 msgstr "plastik"
 
 msgid "steel"
-msgstr ""
+msgstr "baja"
 
 msgid "stone"
 msgstr "batu"
@@ -17401,22 +17432,22 @@ msgid "Power rating (kVA/MVA)"
 msgstr ""
 
 msgid "2700 kVA"
-msgstr ""
+msgstr "2700 kVA"
 
 msgid "12500 kVA"
-msgstr ""
+msgstr "12500 kVA"
 
 msgid "15 MVA"
-msgstr ""
+msgstr "15 MVA"
 
 msgid "50 MVA"
-msgstr ""
+msgstr "50 MVA"
 
 msgid "100 MVA"
 msgstr ""
 
 msgid "Phases"
-msgstr ""
+msgstr "Fase"
 
 msgid "Max. weight (tonnes)"
 msgstr "Berat Maksimum (ton)"
@@ -17434,7 +17465,7 @@ msgid "In the tidal range"
 msgstr ""
 
 msgid "culvert"
-msgstr ""
+msgstr "gorong-gorong"
 
 msgid "Water access rules:"
 msgstr ""
@@ -17446,7 +17477,7 @@ msgid "designated"
 msgstr "ditunjuk"
 
 msgid "Boat"
-msgstr ""
+msgstr "Perahu"
 
 msgid "Motorboat"
 msgstr "perahu motor"
@@ -17455,7 +17486,7 @@ msgid "Canoe"
 msgstr "Kano"
 
 msgid "Substance"
-msgstr ""
+msgstr "Zat"
 
 msgid "water"
 msgstr "air"
@@ -17477,7 +17508,7 @@ msgstr "Dukungan"
 
 msgctxt "mounting/support"
 msgid "pole"
-msgstr ""
+msgstr "tiang"
 
 msgctxt "mounting/support"
 msgid "wall_mounted"
@@ -17498,10 +17529,10 @@ msgid "ICAO"
 msgstr "ICAO"
 
 msgid "Car brand"
-msgstr ""
+msgstr "Merek mobil"
 
 msgid "Motorcycle brand"
-msgstr ""
+msgstr "Merek motor"
 
 msgid "From (initial stop)"
 msgstr "Dari (berawal berhenti)"
@@ -17560,10 +17591,10 @@ msgid "Destination"
 msgstr "Tujuan"
 
 msgid "Destination reference"
-msgstr ""
+msgstr "Referensi tujuan"
 
 msgid "Placement"
-msgstr ""
+msgstr "Penempatan"
 
 msgid "left_of:1"
 msgstr ""
@@ -17593,7 +17624,7 @@ msgid "right_of:3"
 msgstr ""
 
 msgid "transition"
-msgstr ""
+msgstr "transisi"
 
 msgid "Motorway Link"
 msgstr "Penghubung Jalan Tol"
@@ -17667,7 +17698,7 @@ msgid "cycleway"
 msgstr ""
 
 msgid "Vehicle access"
-msgstr ""
+msgstr "Akses kendaraan"
 
 msgid "Oneway for bicycle"
 msgstr "Satu arah untuk sepeda"
@@ -17700,7 +17731,7 @@ msgid "drive-through"
 msgstr ""
 
 msgid "emergency_access"
-msgstr ""
+msgstr "akses darurat"
 
 msgid "Parking Aisle"
 msgstr "Tempat Parkir"
@@ -17776,7 +17807,7 @@ msgstr ""
 
 msgctxt "Highway"
 msgid "pedestrian"
-msgstr ""
+msgstr "pejalan kaki"
 
 msgctxt "Highway"
 msgid "track"
@@ -17937,7 +17968,7 @@ msgid "grade5"
 msgstr "kelas5"
 
 msgid "Soft: soil/sand/grass"
-msgstr ""
+msgstr "Halus:tanah/pasir/rumput"
 
 msgid "MTB Scale"
 msgstr "Skala MTB"
@@ -18009,23 +18040,23 @@ msgstr "Tingkat Penglihatan"
 
 msgctxt "trail_visibility"
 msgid "excellent"
-msgstr ""
+msgstr "baik sekali"
 
 msgctxt "trail_visibility"
 msgid "good"
-msgstr ""
+msgstr "baik"
 
 msgctxt "trail_visibility"
 msgid "intermediate"
-msgstr ""
+msgstr "menengah"
 
 msgctxt "trail_visibility"
 msgid "bad"
-msgstr ""
+msgstr "buruk"
 
 msgctxt "trail_visibility"
 msgid "horrible"
-msgstr ""
+msgstr "sangat buruk"
 
 msgctxt "trail_visibility"
 msgid "no"
@@ -18048,7 +18079,7 @@ msgstr "Jalan melingkar"
 
 msgctxt "cycleway"
 msgid "lane"
-msgstr ""
+msgstr "jalur"
 
 msgctxt "cycleway"
 msgid "track"
@@ -18248,10 +18279,10 @@ msgid "Stop"
 msgstr "Berhenti"
 
 msgid "Give Way"
-msgstr ""
+msgstr "Memberi Jalan"
 
 msgid "Mini-Roundabout"
-msgstr ""
+msgstr "Bundaran-mini"
 
 msgid "clockwise"
 msgstr "Serarah jarum jam"
@@ -18306,19 +18337,19 @@ msgid "Turning Loop"
 msgstr ""
 
 msgid "City Limit Sign"
-msgstr ""
+msgstr "Tanda Batas Kota"
 
 msgid "Second Name"
 msgstr "Nama Kedua"
 
 msgid "Speed Limit Sign"
-msgstr ""
+msgstr "Tanda Batas Kecepatan"
 
 msgid "Speed Camera"
 msgstr "Kecepatan Kamera"
 
 msgid "Traffic Mirror"
-msgstr ""
+msgstr "Cermin Lalu Lintas"
 
 msgid "Highway milestone"
 msgstr ""
@@ -18405,7 +18436,7 @@ msgid "split_rail"
 msgstr "split_rail"
 
 msgid "wire"
-msgstr ""
+msgstr "kawat"
 
 msgid "Guard Rail"
 msgstr "Pembatas Jalan"
@@ -18583,7 +18614,7 @@ msgid "tailings"
 msgstr ""
 
 msgid "water_storage"
-msgstr ""
+msgstr "penyimpanan_air"
 
 msgid "Covered Reservoir"
 msgstr "Ditutupi Waduk"
@@ -18611,10 +18642,10 @@ msgid "oxbow"
 msgstr ""
 
 msgid "pond"
-msgstr ""
+msgstr "kolam"
 
 msgid "reservoir"
-msgstr ""
+msgstr "waduk"
 
 msgid "river"
 msgstr "sungai"
@@ -18623,13 +18654,13 @@ msgid "lock"
 msgstr ""
 
 msgid "wastewater"
-msgstr ""
+msgstr "air limbah"
 
 msgid "Salt Water"
-msgstr ""
+msgstr "Air Asin"
 
 msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
+msgstr "Apakah badan air selalu ada (bersifat musiman)?"
 
 msgid "Coastline"
 msgstr "Garis pantai"
@@ -18739,7 +18770,7 @@ msgid "Marina"
 msgstr "Marina"
 
 msgid "Dump Station"
-msgstr ""
+msgstr "Stasiun Pembuangan"
 
 msgid "public"
 msgstr "publik"
@@ -18831,6 +18862,9 @@ msgstr "Bio Diesel"
 msgid "Octane 80"
 msgstr "80 Oktan"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "Octane 91"
 
@@ -18852,6 +18886,9 @@ msgstr "E10 (10% campuran Ethanol)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% campuran Ethanol)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Liquefied petroleum gas)"
 
@@ -18961,11 +18998,11 @@ msgstr "tidak"
 
 msgctxt "crossing:barrier"
 msgid "half"
-msgstr ""
+msgstr "setengah"
 
 msgctxt "crossing:barrier"
 msgid "full"
-msgstr ""
+msgstr "Penuh"
 
 msgctxt "crossing:barrier"
 msgid "double_half"
@@ -19062,7 +19099,7 @@ msgid "Station"
 msgstr "Stasiun"
 
 msgid "Pylon"
-msgstr ""
+msgstr "Tonggak menara"
 
 msgid "Parking"
 msgstr "Tempat Parkir"
@@ -19137,7 +19174,7 @@ msgid "1/50 mix (mofa/moped)"
 msgstr "Campuran 1/50 (mofa/mofed)"
 
 msgid "Additives:"
-msgstr ""
+msgstr "Aditif"
 
 msgid "Diesel Exhaust Fluid (AdBlue/AUS32)"
 msgstr ""
@@ -19164,7 +19201,7 @@ msgid "Amperage"
 msgstr "Tegangan aliran listrik"
 
 msgid "Types of vehicles which can be charged:"
-msgstr ""
+msgstr "Tipe kendaraan yang bisa diisi ulang"
 
 msgid "Scooter"
 msgstr "Skuter"
@@ -19173,7 +19210,7 @@ msgid "Truck"
 msgstr "Truk"
 
 msgid "Number of Sockets:"
-msgstr ""
+msgstr "Jumlah stop kontak"
 
 msgid "Type 1 (Yazaki)"
 msgstr ""
@@ -19255,7 +19292,7 @@ msgid "dealer"
 msgstr ""
 
 msgid "repair"
-msgstr ""
+msgstr "memperbaiki"
 
 msgid "parts"
 msgstr "bagian"
@@ -19599,7 +19636,7 @@ msgid "Stars"
 msgstr "Bintang"
 
 msgid "Rooms"
-msgstr ""
+msgstr "Kamar"
 
 msgid "Beds"
 msgstr "Kasur"
@@ -19608,7 +19645,7 @@ msgid "Motel"
 msgstr "Motel"
 
 msgid "Guest House/Bed & Breakfast"
-msgstr ""
+msgstr "Rumah Tamu/Tempat Tidur & Sarapan"
 
 msgid "Apartment"
 msgstr "Apartemen"
@@ -19647,7 +19684,7 @@ msgid "recommended"
 msgstr "direkomendasikan"
 
 msgid "members_only"
-msgstr ""
+msgstr "hanya_anggota"
 
 msgid "Closer Description"
 msgstr "Lebih dekat deskripsi"
@@ -19665,7 +19702,7 @@ msgid "Tents allowed"
 msgstr "Tenda diperbolehkan"
 
 msgid "Campsite"
-msgstr ""
+msgstr "Tempah berkemah"
 
 msgid "Caravans allowed"
 msgstr ""
@@ -19686,13 +19723,13 @@ msgid "Microbrewery"
 msgstr "Microbrewery"
 
 msgid "Outdoor seating"
-msgstr ""
+msgstr "Tempat duduk luar"
 
 msgid "Takeaway"
-msgstr ""
+msgstr "Bawa pulang"
 
 msgid "Delivery"
-msgstr ""
+msgstr "Pengiriman"
 
 msgid "Mo-Su 12:00-22:00"
 msgstr "Senin-Minggu 12:00-22:00"
@@ -19833,10 +19870,10 @@ msgid "Closer description"
 msgstr "Deskripsi yang mendekati"
 
 msgid "Audio Guide"
-msgstr ""
+msgstr "Panduan Audio"
 
 msgid "Information using headphones or a mobile phone."
-msgstr ""
+msgstr "Informasi menggunakan headphone atau mobile phone"
 
 msgid "Audioguide via mobile phone?"
 msgstr "Panduan audio via telepon genggam?"
@@ -19845,7 +19882,7 @@ msgid "Phone number"
 msgstr "Nomor Telepon"
 
 msgid "Other Information Point"
-msgstr ""
+msgstr "Titik Informasi Lainnya"
 
 msgid "Leisure"
 msgstr "Kesenggangan"
@@ -19881,13 +19918,13 @@ msgid "Water Park"
 msgstr "Taman Air"
 
 msgid "Beach Resort"
-msgstr ""
+msgstr "Resor Pantai"
 
 msgid "Swimming Pool"
 msgstr "Kolam Renang"
 
 msgid "Used for the water area only."
-msgstr ""
+msgstr "Digunakan hanya untuk area perairan"
 
 msgid "Fitness Station"
 msgstr "Pusat Kebugaran"
@@ -19896,7 +19933,7 @@ msgid "Sauna"
 msgstr "Sauna"
 
 msgid "Horse Riding"
-msgstr ""
+msgstr "Berkuda"
 
 msgid "Playground"
 msgstr "Taman Bermain"
@@ -19921,7 +19958,7 @@ msgid "charcoal"
 msgstr "arang"
 
 msgid "Firepit"
-msgstr ""
+msgstr "Lubang untuk membuat api (firepit)"
 
 msgid "Fishing"
 msgstr "Pemancingan"
@@ -19960,16 +19997,16 @@ msgid "Artwork"
 msgstr "Karya seni"
 
 msgid "mural"
-msgstr ""
+msgstr "lukisan dinding"
 
 msgid "sculpture"
-msgstr ""
+msgstr "seni pahat"
 
 msgid "statue"
-msgstr ""
+msgstr "patung"
 
 msgid "Artist Name"
-msgstr ""
+msgstr "Nama Seniman"
 
 msgid "Studio"
 msgstr "Studio"
@@ -19996,7 +20033,7 @@ msgid "Building type"
 msgstr "tipe bangunan"
 
 msgid "basilica"
-msgstr ""
+msgstr "basilika"
 
 msgid "cathedral"
 msgstr "katedral"
@@ -20253,7 +20290,7 @@ msgid "Emergency"
 msgstr "Darurat"
 
 msgid "Ambulance Station"
-msgstr ""
+msgstr "Stasiun Ambulan"
 
 msgid "Automated Defibrillator"
 msgstr ""
@@ -20268,7 +20305,7 @@ msgid "Located inside a building?"
 msgstr "Berlokasi di dalam bangunan"
 
 msgid "Last check date (YYYY-MM-DD)"
-msgstr ""
+msgstr "Tanggal periksa terakhir (YYYY-MM-DD)"
 
 msgid "Last check note"
 msgstr ""
@@ -20369,7 +20406,7 @@ msgid "air_raid"
 msgstr ""
 
 msgid "civil_defense"
-msgstr ""
+msgstr "pertahanan_sipil"
 
 msgid "Range (in meters)"
 msgstr "Jarak (dalam meter)"
@@ -20424,7 +20461,7 @@ msgid "pitlatrine"
 msgstr ""
 
 msgid "chemical"
-msgstr ""
+msgstr "bahan kimia"
 
 msgid "bucket"
 msgstr ""
@@ -20553,7 +20590,7 @@ msgid "Cardboard"
 msgstr ""
 
 msgid "Electrical Appliances"
-msgstr ""
+msgstr "Peralatan Listrik"
 
 msgid "Glass"
 msgstr "Kaca"
@@ -20562,7 +20599,7 @@ msgid "Glass Bottles"
 msgstr "Botol Kaca"
 
 msgid "Green Waste"
-msgstr ""
+msgstr "Limbah Sayuran"
 
 msgid "Paper"
 msgstr "Kertas"
@@ -20574,7 +20611,7 @@ msgid "Plastic Bottles"
 msgstr "Botol Plastik"
 
 msgid "Plastic Packaging"
-msgstr ""
+msgstr "Kemasan Plastik"
 
 msgid "Scrap Metal"
 msgstr "Besi Tua"
@@ -20583,16 +20620,16 @@ msgid "Shoes"
 msgstr "Sepatu"
 
 msgid "Small Appliances"
-msgstr ""
+msgstr "Peralatan Kecil"
 
 msgid "Waste"
-msgstr ""
+msgstr "Limbah"
 
 msgid "Recycling Centre"
-msgstr ""
+msgstr "Pusat Daur Ulang"
 
 msgid "trash"
-msgstr ""
+msgstr "tempat sampah"
 
 msgid "dog_excrement"
 msgstr ""
@@ -20601,10 +20638,10 @@ msgid "Waste Disposal/Dumpster"
 msgstr "Pembuangan Limbah/Tempat Sampah"
 
 msgid "Sanitary Dump Station"
-msgstr ""
+msgstr "Tempat Pembuangan Sampah"
 
 msgid "Suction pumpout"
-msgstr ""
+msgstr "Pompa hisap"
 
 msgid "Gravity drain for hose"
 msgstr ""
@@ -20662,13 +20699,13 @@ msgid "Water Point"
 msgstr ""
 
 msgid "Animal watering place"
-msgstr ""
+msgstr "Tempat minum binatang"
 
 msgid "Compressed Air"
 msgstr ""
 
 msgid "Valves"
-msgstr ""
+msgstr "Katup"
 
 msgid "Dunlop (Woods)"
 msgstr ""
@@ -20683,10 +20720,10 @@ msgid "Regina"
 msgstr ""
 
 msgid "Advertising Column"
-msgstr ""
+msgstr "Kolom Iklan"
 
 msgid "Billboard"
-msgstr ""
+msgstr "Papan iklan"
 
 msgid "Sports"
 msgstr "Olahraga"
@@ -20730,7 +20767,7 @@ msgstr ""
 
 msgctxt "golf"
 msgid "Hole"
-msgstr ""
+msgstr "Lubang"
 
 msgid "Par"
 msgstr ""
@@ -20827,15 +20864,15 @@ msgstr ""
 
 msgctxt "racing"
 msgid "sports_centre"
-msgstr ""
+msgstr "pusat_olahraga"
 
 msgctxt "racing"
 msgid "stadium"
-msgstr ""
+msgstr "stadion"
 
 msgctxt "racing"
 msgid "track"
-msgstr ""
+msgstr "jalur"
 
 msgid "Dog Racing"
 msgstr "Balap Anjing"
@@ -20850,16 +20887,16 @@ msgid "Gymnastics"
 msgstr "Gimnastik"
 
 msgid "fitness_centre"
-msgstr ""
+msgstr "pusat_kebugaran"
 
 msgid "Ice Skating"
-msgstr ""
+msgstr "Seluncur Es"
 
 msgid "ice_rink"
 msgstr "ice_rink"
 
 msgid "Roller Skating"
-msgstr ""
+msgstr "Sepatu Roda"
 
 msgid "Skateboard"
 msgstr "Skateboard"
@@ -20902,7 +20939,7 @@ msgstr "Sulit"
 
 msgctxt "piste:difficulty"
 msgid "novice"
-msgstr ""
+msgstr "pemula"
 
 msgctxt "piste:difficulty"
 msgid "easy"
@@ -20910,7 +20947,7 @@ msgstr "mudah"
 
 msgctxt "piste:difficulty"
 msgid "intermediate"
-msgstr ""
+msgstr "menengah"
 
 msgctxt "piste:difficulty"
 msgid "advanced"
@@ -20918,7 +20955,7 @@ msgstr ""
 
 msgctxt "piste:difficulty"
 msgid "expert"
-msgstr ""
+msgstr "ahli"
 
 msgctxt "piste:difficulty"
 msgid "freeride"
@@ -20997,7 +21034,7 @@ msgid "Basketball"
 msgstr "Bola Basket"
 
 msgid "Handball"
-msgstr ""
+msgstr "Bola tangan"
 
 msgid "Volleyball"
 msgstr "Bola Voli"
@@ -21027,7 +21064,7 @@ msgid "Field Hockey"
 msgstr ""
 
 msgid "Ice Hockey"
-msgstr ""
+msgstr "Hoki Lapangan"
 
 msgid "Pelota"
 msgstr "Pelota"
@@ -21059,7 +21096,7 @@ msgstr ""
 
 msgctxt "aerialway"
 msgid "sports_centre"
-msgstr ""
+msgstr "pusat_olahraga"
 
 msgctxt "aerialway"
 msgid "track"
@@ -21089,7 +21126,7 @@ msgstr "Sekolah"
 
 msgctxt "building"
 msgid "commercial"
-msgstr ""
+msgstr "komersil"
 
 msgctxt "building"
 msgid "service"
@@ -21109,7 +21146,7 @@ msgstr "kandang kuda"
 
 msgctxt "building"
 msgid "cabin"
-msgstr ""
+msgstr "kabin"
 
 msgctxt "building"
 msgid "farm_auxiliary"
@@ -21117,7 +21154,7 @@ msgstr ""
 
 msgctxt "building"
 msgid "transportation"
-msgstr ""
+msgstr "transportasi"
 
 msgctxt "building"
 msgid "greenhouse"
@@ -21157,7 +21194,7 @@ msgstr "ritel"
 
 msgctxt "building"
 msgid "shed"
-msgstr ""
+msgstr "gudang"
 
 msgctxt "building"
 msgid "storage_tank"
@@ -21165,11 +21202,11 @@ msgstr "tanki penyimpanan"
 
 msgctxt "building"
 msgid "supermarket"
-msgstr ""
+msgstr "supermarket"
 
 msgctxt "building"
 msgid "gasometer"
-msgstr ""
+msgstr "meteran gas"
 
 msgctxt "building"
 msgid "silo"
@@ -21177,15 +21214,15 @@ msgstr ""
 
 msgctxt "building"
 msgid "cowshed"
-msgstr ""
+msgstr "kandang sapi"
 
 msgctxt "building"
 msgid "construction"
-msgstr ""
+msgstr "konstruksi"
 
 msgctxt "building"
 msgid "basilica"
-msgstr ""
+msgstr "basilika"
 
 msgctxt "building"
 msgid "cathedral"
@@ -21209,7 +21246,7 @@ msgstr "masjid"
 
 msgctxt "building"
 msgid "synagogue"
-msgstr ""
+msgstr "sinagoge"
 
 msgctxt "building"
 msgid "transformer_tower"
@@ -21217,7 +21254,7 @@ msgstr ""
 
 msgctxt "building"
 msgid "public"
-msgstr ""
+msgstr "publik"
 
 msgctxt "building"
 msgid "ruins"
@@ -21236,11 +21273,11 @@ msgstr "Permukiman"
 
 msgctxt "building"
 msgid "apartments"
-msgstr ""
+msgstr "apartemen"
 
 msgctxt "building"
 msgid "house"
-msgstr ""
+msgstr "rumah"
 
 msgctxt "building"
 msgid "hotel"
@@ -21248,11 +21285,11 @@ msgstr "hotel"
 
 msgctxt "building"
 msgid "hut"
-msgstr ""
+msgstr "pondok"
 
 msgctxt "building"
 msgid "bungalow"
-msgstr ""
+msgstr "bungalo"
 
 msgctxt "building"
 msgid "dormitory"
@@ -21260,11 +21297,11 @@ msgstr "asrama"
 
 msgctxt "building"
 msgid "terrace"
-msgstr ""
+msgstr "teras"
 
 msgctxt "building"
 msgid "detached"
-msgstr ""
+msgstr "terpisah"
 
 msgctxt "building"
 msgid "farm"
@@ -21285,11 +21322,11 @@ msgstr "Pintu Masuk"
 
 msgctxt "entrance"
 msgid "yes"
-msgstr ""
+msgstr "ya"
 
 msgctxt "entrance"
 msgid "main"
-msgstr ""
+msgstr "utama"
 
 msgctxt "entrance"
 msgid "service"
@@ -21309,7 +21346,7 @@ msgstr "tangga"
 
 msgctxt "entrance"
 msgid "home"
-msgstr ""
+msgstr "rumah"
 
 msgid "Entrance number"
 msgstr ""
@@ -21359,7 +21396,7 @@ msgstr "Bahan bakar"
 
 msgctxt "content"
 msgid "manure"
-msgstr ""
+msgstr "pupuk"
 
 msgctxt "content"
 msgid "oil"
@@ -21367,7 +21404,7 @@ msgstr "minyak"
 
 msgctxt "content"
 msgid "sewage"
-msgstr ""
+msgstr "kotoran"
 
 msgctxt "content"
 msgid "silage"
@@ -21496,7 +21533,7 @@ msgid "Water Works"
 msgstr "Water Works"
 
 msgid "Wastewater Treatment Plant"
-msgstr ""
+msgstr "Pengelolaan Air Limbah"
 
 msgid "Watermill"
 msgstr "Watermill"
@@ -21507,6 +21544,12 @@ msgstr "Air Mancur"
 msgid "Water Well"
 msgstr "Sumur"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Mercusuar"
 
@@ -21518,16 +21561,16 @@ msgid "Street Lamp"
 msgstr "Lampu Jalan"
 
 msgid "Monitoring Station"
-msgstr ""
+msgstr "Stasiun Pemantauan"
 
 msgid "Monitoring:"
-msgstr ""
+msgstr "Pemantauan:"
 
 msgid "Water level"
 msgstr "Batas air"
 
 msgid "Tide Level"
-msgstr ""
+msgstr "Tingkat Pasang Surut"
 
 msgid "Groundwater"
 msgstr "Air tanah"
@@ -21830,31 +21873,31 @@ msgid "pyrolysis"
 msgstr ""
 
 msgid "combustion"
-msgstr ""
+msgstr "pembakaran"
 
 msgid "steam_turbine"
-msgstr ""
+msgstr "turbin_uap"
 
 msgid "Coal Power Generator"
-msgstr ""
+msgstr "Pembangkit Tenaga Batu Bara"
 
 msgid "Gas Power Generator"
-msgstr ""
+msgstr "Pembangkit Tenaga Gas"
 
 msgid "combined_cycle"
 msgstr ""
 
 msgid "Oil Power Generator"
-msgstr ""
+msgstr "Generator Tenaga Minyak"
 
 msgid "Diesel Power Generator"
-msgstr ""
+msgstr "Generator Tenaga Diesel"
 
 msgid "Gasoline Power Generator"
-msgstr ""
+msgstr "Generator Tenaga Bensin"
 
 msgid "Nuclear Reactor"
-msgstr ""
+msgstr "Reaktor Nuklir"
 
 msgctxt "generator method"
 msgid "fission"
@@ -21922,7 +21965,7 @@ msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
 msgstr ""
 
 msgid "Solar Power Generator"
-msgstr ""
+msgstr "Generator Tenaga Surya"
 
 msgctxt "generator method"
 msgid "photovoltaic"
@@ -21930,7 +21973,7 @@ msgstr ""
 
 msgctxt "generator method"
 msgid "thermal"
-msgstr ""
+msgstr "panas"
 
 msgid "solar_photovoltaic_panel"
 msgstr ""
@@ -21942,10 +21985,10 @@ msgid "solar_thermal_collector"
 msgstr ""
 
 msgid "thermal"
-msgstr ""
+msgstr "panas"
 
 msgid "Waste Power Generator"
-msgstr ""
+msgstr "Generator Tenaga Limbah"
 
 msgctxt "generator method"
 msgid "pyrolysis"
@@ -21982,7 +22025,7 @@ msgid "run-of-the-river"
 msgstr ""
 
 msgid "kaplan_turbine"
-msgstr ""
+msgstr "turbin kaplan"
 
 msgid "run-of-the-river / water-storage"
 msgstr ""
@@ -21999,25 +22042,25 @@ msgstr ""
 
 msgctxt "generator method"
 msgid "stream"
-msgstr ""
+msgstr "arus"
 
 msgid "horizontal_axis"
-msgstr ""
+msgstr "sumbu_horizontal"
 
 msgid "barrage"
 msgstr ""
 
 msgid "vertical_axis"
-msgstr ""
+msgstr "sumbu_vertikal"
 
 msgid "Wave Energy Converter"
-msgstr ""
+msgstr "konverter energi gelombang"
 
 msgid "Osmotic Power Generator"
 msgstr ""
 
 msgid "Geothermal Power Generator"
-msgstr ""
+msgstr "Generator Tenaga Panas Bumi"
 
 msgid "heat_pump"
 msgstr ""
@@ -22029,7 +22072,7 @@ msgid "Power Substation"
 msgstr "Gardu Listrik"
 
 msgid "Type of substation"
-msgstr ""
+msgstr "jenis substansi"
 
 msgctxt "power"
 msgid "transmission"
@@ -22045,7 +22088,7 @@ msgstr ""
 
 msgctxt "power"
 msgid "converter"
-msgstr ""
+msgstr "konverter"
 
 msgctxt "power"
 msgid "compensation"
@@ -22057,7 +22100,7 @@ msgstr "transisi"
 
 msgctxt "power"
 msgid "traction"
-msgstr ""
+msgstr "daya tarik"
 
 msgctxt "power"
 msgid "industrial"
@@ -22110,11 +22153,11 @@ msgstr ""
 
 msgctxt "power"
 msgid "mechanical"
-msgstr ""
+msgstr "mekanis"
 
 msgctxt "power"
 msgid "circuit_breaker"
-msgstr ""
+msgstr "pemutus_urus"
 
 msgctxt "power"
 msgid "disconnector"
@@ -22125,10 +22168,10 @@ msgid "earthing"
 msgstr ""
 
 msgid "Power Converter"
-msgstr ""
+msgstr "Konverter Tenaga"
 
 msgid "Type of converter"
-msgstr ""
+msgstr "Tipe konverter"
 
 msgctxt "power"
 msgid "lcc"
@@ -22319,11 +22362,11 @@ msgstr ""
 
 msgctxt "power"
 msgid "asymmetric"
-msgstr ""
+msgstr "asimetris"
 
 msgctxt "power"
 msgid "triangle"
-msgstr ""
+msgstr "segitiga"
 
 msgctxt "power"
 msgid "flag"
@@ -22406,7 +22449,7 @@ msgid "Transformer Attributes:"
 msgstr ""
 
 msgid "Insulator"
-msgstr ""
+msgstr "Isolator"
 
 msgid "Power Line"
 msgstr "Kabel Listrik"
@@ -22467,7 +22510,7 @@ msgstr "di bawah air"
 
 msgctxt "power cable"
 msgid "overground"
-msgstr ""
+msgstr "di atas tanah"
 
 msgid "Historic Places"
 msgstr "Tempat bersejarah"
@@ -22488,19 +22531,19 @@ msgid "manor"
 msgstr ""
 
 msgid "palace"
-msgstr ""
+msgstr "istana"
 
 msgid "Archaeological Site"
 msgstr "Situs Arkeologi"
 
 msgid "tumulus"
-msgstr ""
+msgstr "bukit pemakaman"
 
 msgid "megalith"
-msgstr ""
+msgstr "megalit"
 
 msgid "fortification"
-msgstr ""
+msgstr "benteng"
 
 msgid "settlement"
 msgstr ""
@@ -22522,7 +22565,7 @@ msgstr "makam"
 
 msgctxt "tomb"
 msgid "tumulus"
-msgstr ""
+msgstr "bukit pemakaman"
 
 msgctxt "tomb"
 msgid "rock-cut"
@@ -22534,7 +22577,7 @@ msgstr ""
 
 msgctxt "tomb"
 msgid "war_grave"
-msgstr ""
+msgstr "kuburan_perang"
 
 msgctxt "tomb"
 msgid "mausoleum"
@@ -22652,7 +22695,7 @@ msgid "Tea"
 msgstr "Teh"
 
 msgid "Coffee"
-msgstr ""
+msgstr "Kopi"
 
 msgid "Public Market"
 msgstr ""
@@ -22742,7 +22785,7 @@ msgid "Pawnbroker"
 msgstr ""
 
 msgid "Home decoration"
-msgstr ""
+msgstr "dekorasi rumah"
 
 msgid "Furniture"
 msgstr "Furniture"
@@ -22751,13 +22794,13 @@ msgid "Kitchen"
 msgstr "Dapur"
 
 msgid "Houseware"
-msgstr ""
+msgstr "Peralatan rumah tangga"
 
 msgid "Curtain"
 msgstr "Gorden"
 
 msgid "Art"
-msgstr ""
+msgstr "Seni"
 
 msgid "Frame"
 msgstr "Frame"
@@ -22769,7 +22812,7 @@ msgid "Interior Decoration"
 msgstr "Dekorasi Interior"
 
 msgid "Antiques"
-msgstr ""
+msgstr "Barang Antik"
 
 msgid "Printed Material"
 msgstr ""
@@ -23070,7 +23113,7 @@ msgstr ""
 
 msgctxt "office"
 msgid "Accountant"
-msgstr ""
+msgstr "Akuntan"
 
 msgctxt "office"
 msgid "Administrative"
@@ -23190,7 +23233,7 @@ msgid "Key cutter"
 msgstr ""
 
 msgid "Locksmith"
-msgstr ""
+msgstr "Tukang kunci"
 
 msgid "Electrician"
 msgstr "Tukang listrik"
@@ -23208,7 +23251,7 @@ msgid "Tiler"
 msgstr ""
 
 msgid "Window construction"
-msgstr ""
+msgstr "Konstruksi jendela"
 
 msgid "Carpenter"
 msgstr "Tukang kayu"
@@ -23232,16 +23275,16 @@ msgid "Shoemaker"
 msgstr "Tukang sepatu"
 
 msgid "Sawmill"
-msgstr ""
+msgstr "Penggergajian"
 
 msgid "Stonemason"
-msgstr ""
+msgstr "Tukang batu"
 
 msgid "Blacksmith"
 msgstr "Pandai besi"
 
 msgid "Metal construction"
-msgstr ""
+msgstr "Konstruksi logam"
 
 msgid "Geography"
 msgstr "Geografi"
@@ -23256,16 +23299,16 @@ msgid "Administrative level"
 msgstr "Level Administratif"
 
 msgid "Maritime"
-msgstr ""
+msgstr "Maritim"
 
 msgid "Political"
 msgstr "Politik"
 
 msgid "Division"
-msgstr ""
+msgstr "Divisi"
 
 msgid "canton"
-msgstr ""
+msgstr "wilayah"
 
 msgid "linguistic_community"
 msgstr ""
@@ -23277,7 +23320,7 @@ msgid "National Park"
 msgstr "Taman Nasional"
 
 msgid "Protected Area"
-msgstr ""
+msgstr "Kawasan lindung"
 
 msgid "Protect Class"
 msgstr ""
@@ -23286,7 +23329,7 @@ msgid "Title or type of protection"
 msgstr ""
 
 msgid "Border type"
-msgstr ""
+msgstr "Tipe batas"
 
 msgid "baseline"
 msgstr ""
@@ -23295,7 +23338,7 @@ msgid "territorial"
 msgstr ""
 
 msgid "contiguous"
-msgstr ""
+msgstr "berdekatan"
 
 msgid "eez"
 msgstr ""
@@ -23379,19 +23422,19 @@ msgid "Volcano"
 msgstr "Gunung Api"
 
 msgid "A volcano, either dormant, extinct or active."
-msgstr ""
+msgstr "Gunung berapi, terbengkalai, punah atau aktif."
 
 msgid "Current Status"
 msgstr "Status terkini"
 
 msgid "dormant"
-msgstr ""
+msgstr "terbengkalai"
 
 msgid "extinct"
 msgstr "punah"
 
 msgid "stratovolcano"
-msgstr ""
+msgstr "stratovulkanis"
 
 msgid "shield"
 msgstr "pelindung"
@@ -23450,13 +23493,13 @@ msgid "Tree"
 msgstr "Pohon"
 
 msgid "A single tree."
-msgstr ""
+msgstr "Pohon tunggal"
 
 msgid "Tree Row"
-msgstr ""
+msgstr "Baris pepohonan"
 
 msgid "A line of trees."
-msgstr ""
+msgstr "Deretan pohon."
 
 msgid "Wood"
 msgstr "Hutan"
@@ -23472,7 +23515,7 @@ msgstr ""
 
 msgctxt "cutline"
 msgid "border"
-msgstr ""
+msgstr "batas"
 
 msgctxt "cutline"
 msgid "firebreak"
@@ -23610,15 +23653,15 @@ msgstr ""
 
 msgctxt "crop"
 msgid "corn"
-msgstr ""
+msgstr "jagung"
 
 msgctxt "crop"
 msgid "grass"
-msgstr ""
+msgstr "rumput"
 
 msgctxt "crop"
 msgid "rice"
-msgstr ""
+msgstr "padi"
 
 msgctxt "crop"
 msgid "wheat"
@@ -23671,7 +23714,7 @@ msgid "walnut_trees"
 msgstr "pohon kenari"
 
 msgid "plum_trees"
-msgstr ""
+msgstr "pohon_plum"
 
 msgid "peach_trees"
 msgstr "pohon persik"
@@ -23692,7 +23735,7 @@ msgid "Salt Pond"
 msgstr ""
 
 msgid "Aquaculture"
-msgstr ""
+msgstr "Budidaya Perikanan"
 
 msgid "shrimp"
 msgstr "udang"
@@ -23780,7 +23823,7 @@ msgstr ""
 
 msgctxt "industrial"
 msgid "mine"
-msgstr ""
+msgstr "tambang"
 
 msgctxt "industrial"
 msgid "oil"
@@ -23788,7 +23831,7 @@ msgstr "minyak"
 
 msgctxt "industrial"
 msgid "port"
-msgstr ""
+msgstr "pelabuhan"
 
 msgctxt "industrial"
 msgid "salt_pond"
@@ -23796,7 +23839,7 @@ msgstr ""
 
 msgctxt "industrial"
 msgid "sawmill"
-msgstr ""
+msgstr "pemotongan kayu"
 
 msgctxt "industrial"
 msgid "scrap_yard"
@@ -23804,11 +23847,11 @@ msgstr ""
 
 msgctxt "industrial"
 msgid "shipyard"
-msgstr ""
+msgstr "bengkel kapal"
 
 msgctxt "industrial"
 msgid "slaughterhouse"
-msgstr ""
+msgstr "tempat pemotongan hewan"
 
 msgctxt "industrial"
 msgid "warehouse"
@@ -24121,7 +24164,7 @@ msgstr ""
 
 msgctxt "note=*, fixme=*, description=*"
 msgid "Similar but different tags:"
-msgstr ""
+msgstr "Serupa namun berbeda tag:"
 
 msgctxt "the tag note=*"
 msgid "Note"
@@ -24129,7 +24172,7 @@ msgstr "Catatan"
 
 msgctxt "note=*"
 msgid "An important hint for other mappers (not for the end user)."
-msgstr ""
+msgstr "Petunjuk penting untuk pemeta lain (bukan untuk pengguna akhir)."
 
 msgid "Fixme"
 msgstr "Perbaiki"
@@ -24180,10 +24223,10 @@ msgid "Label point"
 msgstr "Label titik"
 
 msgid "Outline of building"
-msgstr ""
+msgstr "Garis luar bangunan"
 
 msgid "Inner segment"
-msgstr ""
+msgstr "Segmen dalam"
 
 msgid "Roof ridge"
 msgstr ""
@@ -24213,7 +24256,7 @@ msgid "members of site"
 msgstr "member dari situs"
 
 msgid "Turn Restriction"
-msgstr ""
+msgstr "Larangan Berbelok"
 
 msgid "Restriction"
 msgstr "Pelarangan"
@@ -24580,6 +24623,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 ""
 
@@ -24661,7 +24731,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -24676,7 +24746,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 ""
@@ -24684,21 +24754,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 ""
 
@@ -24837,13 +24929,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"
@@ -24876,14 +24968,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 ""
@@ -24949,7 +25041,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)"
@@ -25036,13 +25128,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)"
@@ -25210,34 +25302,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 "Gambar dari setelah erupsi tahun 2014/2015 (warna sebenarnya)"
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
 msgstr ""
 
 msgid ""
@@ -25245,7 +25336,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)"
@@ -25293,7 +25384,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -25301,7 +25392,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 ""
@@ -25470,8 +25561,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 ""
@@ -25479,9 +25569,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 ""
@@ -25489,10 +25577,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"
@@ -25525,57 +25613,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 ""
@@ -25583,13 +25666,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 ""
@@ -25657,13 +25740,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 ""
@@ -25671,7 +25754,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -25679,7 +25762,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -25687,19 +25770,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 ""
@@ -25804,13 +25887,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 ""
@@ -25818,7 +25901,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)"
@@ -25912,13 +25995,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 ""
 
@@ -26006,6 +26082,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 ""
 
@@ -26014,6 +26104,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 ""
 
@@ -26021,13 +26135,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 ""
@@ -26041,7 +26155,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 ""
@@ -26049,29 +26163,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)"
@@ -26140,7 +26253,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"
@@ -26173,6 +26289,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 ""
 
@@ -26221,33 +26343,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 ""
@@ -26255,7 +26375,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)"
@@ -26301,25 +26421,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"
@@ -26343,7 +26463,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)"
@@ -26439,7 +26559,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 ""
@@ -26447,6 +26567,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 ""
 
@@ -26465,7 +26592,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)"
@@ -26527,7 +26654,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 ""
@@ -26535,13 +26662,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)"
@@ -26628,7 +26755,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 ""
@@ -26636,7 +26770,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"
@@ -26651,6 +26785,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -27323,16 +27463,16 @@ msgid "{0} without {1} or {2}"
 msgstr ""
 
 msgid "{0} without {1}, {2} or {3}"
-msgstr ""
+msgstr "{0} tanpa {1}, {2} atau {3}"
 
 msgid "{0} together with {1}"
-msgstr ""
+msgstr "{0} bersama {1}"
 
 msgid "suspicious tag combination"
-msgstr ""
+msgstr "kombinasi tag mencurigakan"
 
 msgid "two objects, one with {0} and one with {1} + {2} + {3}"
-msgstr ""
+msgstr "dua objek, satu dengan {0} dan satu dengan {1} + {2} + {3}"
 
 msgid "incomplete object: only {0}"
 msgstr "objek belum komplit: hanya {0}"
@@ -27344,7 +27484,7 @@ msgid "{0} together with addr:*"
 msgstr ""
 
 msgid "{0} together with {1} and conflicting values"
-msgstr ""
+msgstr "{0} bersama dengan {1} dan nilai konflik"
 
 msgid "{0} on suspicious object"
 msgstr "{0} pada objek mencurigakan"
@@ -27362,13 +27502,13 @@ msgid "incomplete usage of {0} on a way without {1}"
 msgstr ""
 
 msgid "Same value of {0}, {1} and {2}"
-msgstr ""
+msgstr "Nilai serupa dari {0}, {1} dan {2}"
 
 msgid "{0} and {1} together with {2} and conflicting values"
-msgstr ""
+msgstr "{0} dan {1} bersama dengan {2} dan nilai konflik"
 
 msgid "{0} on a relation without {1}"
-msgstr ""
+msgstr "{0} pada relasi tanpa {1}"
 
 msgid ""
 "Long waterway with {0} but without a tag which defines it as tunnel or "
@@ -27389,10 +27529,10 @@ msgid "Different number of lanes in the keys {0} and {1}"
 msgstr ""
 
 msgid "possibly missing {0} tag"
-msgstr ""
+msgstr "kemungkinan hilang {0} tag"
 
 msgid "street with odd number of {0}, but without {1} and {2} or {3}"
-msgstr ""
+msgstr "jalan dengan nomer ganjil dari {0}. namun tanpa {1} dan {2} atau {3}"
 
 msgid "{0} is deprecated"
 msgstr "{0} sudah usang"
@@ -27401,12 +27541,14 @@ msgid "deprecated tagging"
 msgstr ""
 
 msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
-msgstr ""
+msgstr "\"{0}\" tidak berarti, gunakan spesifik tag, misalnya. \"{1}\""
 
 msgid ""
 "''{0}'' does not specify the official mode of transportation, use ''{1}'' "
 "for example"
 msgstr ""
+"\"{0}\" tidak menentukan mode resmi transportasi, gunakan \"{1}\" untuk "
+"contoh"
 
 msgid ""
 "{0}={1} is unspecific. Instead of ''{1}'' please give more information about "
@@ -27417,6 +27559,8 @@ msgid ""
 "Wrong usage of {0} tag. Remove {1}, because it is clear that the name is "
 "missing even without an additional tag."
 msgstr ""
+"Kesalahan penggunaan {0} tag. Hilangkan {1}. karena jelas bahwa namanya "
+"hilang bahkan tanpa tag tambahan."
 
 msgid ""
 "{0} is unspecific. Instead use the key fixme with the information what "
@@ -27452,7 +27596,7 @@ msgid "Unspecific tag {0}"
 msgstr "Tag tidak spesifik {0}"
 
 msgid "Definition of {0} is unclear"
-msgstr ""
+msgstr "Definisi {0} tidak jelas"
 
 msgid "{0} + {1} + {2}"
 msgstr "{0} + {1} + {2}"
@@ -27465,7 +27609,7 @@ msgid "{0}"
 msgstr "{0}"
 
 msgid "key with uncommon character"
-msgstr ""
+msgstr "key dengan karakter tidak umum"
 
 msgid "uncommon short key"
 msgstr ""
@@ -27483,10 +27627,10 @@ msgid "questionable key (ending with a number)"
 msgstr ""
 
 msgid "The key {0} has an uncommon value."
-msgstr ""
+msgstr "Key {0} memiliki nilai tidak umum"
 
 msgid "misspelled value"
-msgstr ""
+msgstr "salah eja nilai"
 
 msgid "wrong value: {0}"
 msgstr "salah nilai: {0}"
@@ -27518,7 +27662,7 @@ msgid ""
 msgstr ""
 
 msgid "{0} together with {1} on a node. Remove {0}."
-msgstr ""
+msgstr "{0} bersamaan dengan {1} pada titik. Hapus {0}."
 
 msgid "{0} on a node"
 msgstr "{0} pada node"
@@ -27539,7 +27683,7 @@ msgid "Overlapping Identical Natural Areas"
 msgstr ""
 
 msgid "Overlapping Identical Landuses"
-msgstr ""
+msgstr "Penggunaan lahan identik bertumpukkan"
 
 msgid "isolated node which must be connected to a way"
 msgstr ""
@@ -27640,38 +27784,34 @@ msgid "{0} value with + sign"
 msgstr ""
 
 msgid "{0} should be an integer value between -5 and 5"
-msgstr ""
+msgstr "{0} sebaiknya nilai bilangan bulat antara -5 dan 5"
 
 msgid "{0} should have numbers only with optional .5 increments"
+msgstr "{0} sebaiknya hanya memiliki angka dengan opsi kenaikan .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 ""
 
 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 ""
-
-msgid "unusual {0} specification"
-msgstr ""
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr ""
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr ""
+msgstr "voltase sebaiknya dalam volt tanpa satuan/pembatas/jarak"
 
 msgid "{0} must be a numeric value"
 msgstr "{0} harus nilai numeric"
@@ -27679,9 +27819,6 @@ msgstr "{0} harus nilai numeric"
 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 "{0} harus dalam nilai numerik, dalam meter dan tanpa satuan."
 
@@ -27789,6 +27926,9 @@ msgstr "Sembunyikan icon pada perbesaran rendah"
 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 "Tampillkan label jalan (pada perbesaran tinggi)"
 
@@ -27836,6 +27976,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."
@@ -27879,6 +28022,9 @@ msgstr ""
 "Menerapkan baris perintah dan memungkinkan untuk membuat perintah Anda. "
 "Lihat link untuk perintah standar (busur, lingkaran dll.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -27930,6 +28076,11 @@ msgstr "Tunjukkan profil ketinggian dan beberapa data dari track GPS"
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Penanganan EPCIs Perancis (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Gunakan skrip eksternal dalam JOSM"
 
@@ -28133,6 +28284,9 @@ msgstr ""
 "Memungkinkan membuka berkas gpx/osm yang bersinggungan area layer yang "
 "terlihat saat ini"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -28152,7 +28306,7 @@ msgid ""
 msgstr ""
 
 msgid "Import/export OSM data in PBF format"
-msgstr ""
+msgstr "Import/export data OSM dalam format PBF"
 
 msgid "Import PDF file and convert to ways."
 msgstr "Import berkas PDF dan konversi ke garis"
@@ -28207,7 +28361,7 @@ msgid "Relation and multipolygon creating and editing panel."
 msgstr "membuat relasi dan multipoligon dan mengedit panel."
 
 msgid "Plugin for reverting changesets"
-msgstr ""
+msgstr "Plugin untuk mengembalikan changesets"
 
 msgid ""
 "Expand a simple intersection to a roundabout in gradual steps. Select an "
@@ -28972,552 +29126,6 @@ msgstr "Impor gambar tergeoreferensi"
 msgid "Error while creating image layer: "
 msgstr "Kesalahan ketika membuat layer gambar: "
 
-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 "Mode penggabungan"
-
-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 "Tunda"
-
-msgid "approved"
-msgstr "disetujui"
-
-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 "Perbesar ke gambar terpilih"
-
-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 "Batas kecepatan"
-
-msgid "Give way"
-msgstr "Beri jalan"
-
-msgid "No entry"
-msgstr ""
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr ""
-
-msgid "No parking"
-msgstr "Dilarang parkir"
-
-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 "Tidak ada gambar terpilih"
-
-msgid "Press \"{0}\" to download images"
-msgstr "Tekan \"{0}\" untuk download gambar"
-
-msgid "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Next picture"
-msgstr "Gambar berikutnya"
-
-msgid "Shows the next picture in the sequence"
-msgstr ""
-
-msgid "Previous picture"
-msgstr "Gambar sebelumnya"
-
-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 "Gunakan format 24 jam"
-
-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 "Mode unduh"
-
-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 "Login"
-
-msgid "Logout"
-msgstr "Keluar"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-
-msgid "Upload selected sequence"
-msgstr ""
-
-msgid "Delete after upload"
-msgstr "Hapus setelah mengunggah"
-
-msgid "Wait for full quality pictures"
-msgstr "Tunggu untuk kualitas gambar yang baik"
-
-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 "import"
-
-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 "Pilih gambar yang ingin anda masukkan"
-
-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 "Saya mengerti, tutup."
-
-msgid "Image info"
-msgstr "Info gambar"
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr "Tampilkan dalam browser"
-
-msgid "Copy key"
-msgstr "Salin key"
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr "Deteksi gambar"
-
-msgid "Image actions"
-msgstr ""
-
-msgid "Image key"
-msgstr "Key gambar"
-
-msgid "Sequence key"
-msgstr ""
-
-msgid "{0} detections"
-msgstr "{0} deteksi"
-
-msgid "image has no key"
-msgstr "gambar tidak memiliki key"
-
-msgid "unknown user"
-msgstr "pengguna tidak diketahui"
-
-msgid "sequence has no key"
-msgstr ""
-
-msgid "Could not open the URL {0} in a browser"
-msgstr ""
-
-msgid "Downloading map objects…"
-msgstr "Unduh objek peta"
-
-msgid "All map objects loaded."
-msgstr ""
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-"Terlalu banyak objek pada peta, perbesar tampilan untuk melihat semua."
-
-msgid "Downloading map objects failed!"
-msgstr "Gagal mengunduh objek peta!"
-
-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] "Hapus {0} gambar"
-
-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 ""
-"Untuk menyelesaikan masalah ini, anda dapat memperbesar tampilan dan pilih "
-"area yang lebih kecil pada peta."
-
-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 "Mengunduh"
-
-msgid "Select mode"
-msgstr "Pilih mode"
-
-msgid "Mapillary login"
-msgstr ""
-
-msgid "Login successful, return to JOSM."
-msgstr "Berhasil masuk, kembali ke JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Mendukung format gambar (JPG dan PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "Mengunduh gambar Mapillary"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Total gambar Mapillary: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr "Gambar tidak ditemukan"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr "Anda telah berhasil mengunggah {0} gambar ke mapillary.com"
-
-msgid "Finished upload"
-msgstr "Selesai mengunggah"
-
-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 "Mengunggah: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -30110,7 +29718,7 @@ msgid "update building info"
 msgstr "perbarui info bangunan"
 
 msgid "Tag Element"
-msgstr ""
+msgstr "Elemen Tag"
 
 msgid "Select an item to tag."
 msgstr ""
@@ -30131,7 +29739,7 @@ msgid "Area Selector"
 msgstr ""
 
 msgid "Trying to detect an area at:"
-msgstr ""
+msgstr "Mencoba mendeteksi area pada:"
 
 msgid "create building"
 msgstr ""
@@ -30194,7 +29802,7 @@ msgid ""
 msgstr ""
 
 msgid "Angle Tolerance"
-msgstr ""
+msgstr "Toleransi Sudut"
 
 msgid ""
 "The color threshold defines how much a color may differ from the selected "
@@ -30251,7 +29859,7 @@ msgid "Debugging mode will write images for each processing step."
 msgstr ""
 
 msgid "Please choose the address type"
-msgstr ""
+msgstr "Silakan pilih tipe alamat"
 
 msgid ""
 "<html>We could not automatically determine whether <strong>{0}</strong> "
@@ -30283,7 +29891,7 @@ msgid "Austria Address Helper"
 msgstr ""
 
 msgid "No address type selected. Aborting."
-msgstr ""
+msgstr "Tipe alamat tidak dipilih. Batalkan."
 
 msgid "Successfully added address to selected object:"
 msgstr "Berhasil menambahkan alamat pada objek terpilih:"
@@ -30297,9 +29905,116 @@ msgstr "Tidak ada ada alamat ditemukan pada objek ini."
 msgid "An unexpected exception occurred:"
 msgstr ""
 
-msgid "Building Generalization"
+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 ""
+"Alat ini hanya dapat mengganti node/titik, memperbaharui node/titik ke "
+"way/garis atau multipoligon, atau mengganti way/garis dengan way/garis"
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "Node yang termasuk kedalam way/garis, tidak dapat diganti"
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+"Relasi bukan merupakan multipoligon, tidak bisa digunakan sebagai pengganti"
+
+msgid "Replace geometry for node {0}"
+msgstr "Ganti geometri untuk node/titik {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Harap pilih satu way/garis yang ada pada database dan satu way/garis baru "
+"dengan geometri yang benar"
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "Way/garis harus seluruhnya berada di area yang terdownload"
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"Way/garis yang diganti tidak dapat mempunyai semua node/titik dengan "
+"kelompaok properti atau relasi kecuali dia termasuk kedalam kedua way/garis"
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"Melebihi batas iterasi untuk metode yang kuat, menggunakan metode yang lebih "
+"simpel"
+
+msgid "Replace geometry for way {0}"
+msgstr "Ganti geometri untuk way/garis {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Terlalu banyak way/garis yang ditambahkan {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
 msgstr ""
 
+msgid "Mode:KnifeTool"
+msgstr ""
+
+msgid "Building Generalization"
+msgstr "Generalalisasi Bangunan"
+
 msgid ""
 "Beginners draw outlines often very inaccurate. Such buildings shall be "
 "converted to rectangular ones. Angles between 84-96 degrees are converted to "
@@ -30310,7 +30025,7 @@ msgid "There is no frame loaded !"
 msgstr ""
 
 msgid "Alert Message"
-msgstr ""
+msgstr "Pesan Peringatan"
 
 msgid "Street Name:"
 msgstr "Nama Jalan:"
@@ -30330,9 +30045,30 @@ msgstr "Tag bangunan:"
 msgid "Cannot place building outside of the world."
 msgstr "Tidak bisa menempatkan bangunan diluar dunia"
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Buat bangunan"
 
+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 "Atur besar bangunan"
 
@@ -30345,8 +30081,17 @@ msgstr "Otomatis memilih bangunan"
 msgid "Use address nodes under buildings"
 msgstr "Gunakan alamat node/titik dibawah bangunan"
 
-msgid "Buildings width:"
-msgstr "Lebar Bangunan:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Panjang langkah:"
@@ -30383,16 +30128,14 @@ msgstr ""
 
 msgid "There is {0} building with multiple address nodes inside"
 msgid_plural "There are {0} buildings with multiple address nodes inside"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Terdapat {0} bangunan dengan titik alamat berganda di dalamnya"
 
 msgid "There is {0} building with address conflicts"
 msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Terdapat {0} bangunan dengan konflik alamat"
 
 msgid "No address nodes inside buildings found"
-msgstr ""
+msgstr "Tidak ditemukan titik alamat di dalam bangunan"
 
 msgid "Auto sourcing"
 msgstr "Otomatis mencari"
@@ -30578,7 +30321,7 @@ msgid "Download from Cadastre"
 msgstr ""
 
 msgid "Objects:"
-msgstr ""
+msgstr "Objek:"
 
 msgid "Select to download buildings in the selected download area."
 msgstr "Pilih untuk mengunduh bangunan dalam area unduh yang dipilih"
@@ -30638,7 +30381,7 @@ msgid "Download cadastre data"
 msgstr ""
 
 msgid "Recipient"
-msgstr ""
+msgstr "Penerima"
 
 msgid "Diffusion restriction"
 msgstr ""
@@ -31019,10 +30762,10 @@ msgid "Is not vectorized."
 msgstr "Bukan vektorisasi"
 
 msgid "Bounding box: {0}"
-msgstr ""
+msgstr "Kotak Pembatas: {0}"
 
 msgid "Image size (px): {0}/{1}"
-msgstr ""
+msgstr "Ukuran gambar (px): {0}/{1}"
 
 msgid "Is vectorized."
 msgstr "vektorisasi"
@@ -31076,6 +30819,18 @@ msgstr "Hapus skema yang dipilih dari daftar"
 msgid "Color Schemes"
 msgstr "Skema warna"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Keluar dari editing tag dan tutup dialog"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Terapkan tag yang telah diedit dan tutup dialog"
+
 msgid "Conflation"
 msgstr ""
 
@@ -31155,12 +30910,11 @@ msgid "Conflate object pair"
 msgstr ""
 
 msgid "Cannot replace geometry."
-msgstr ""
+msgstr "Tidak dapat mengganti geometri"
 
 msgid "Added {0} object to subject layer"
 msgid_plural "Added {0} objects to subject layer"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Menambahkan {0} objek ke layer subjek"
 
 msgid "Moved {0} conflation match to unmatched list"
 msgid_plural "Moved {0} conflation matches to unmatched list"
@@ -31277,7 +31031,7 @@ msgid "List of tags to NOT merge (they will be ignored)"
 msgstr ""
 
 msgid "Overwrite tags without confirmation"
-msgstr ""
+msgstr "Menimpa tag tanpa konfirmasi"
 
 msgid ""
 "List of tags to overwrite on conflict using reference layer without "
@@ -31300,7 +31054,7 @@ msgid "Generate matches"
 msgstr ""
 
 msgid "Merging"
-msgstr ""
+msgstr "Menggabungkan"
 
 msgid "Reference:"
 msgstr ""
@@ -31397,7 +31151,7 @@ msgid ""
 msgstr ""
 
 msgid "Requires restart"
-msgstr ""
+msgstr "Harus memulai ulang"
 
 msgid "Max threads"
 msgstr ""
@@ -31573,6 +31327,9 @@ msgstr "Buka panel GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Perbesar untuk melihat pesan"
 
+msgid "Login"
+msgstr "Login"
+
 msgid "Enable autologin"
 msgstr "tersedia login otomatis"
 
@@ -31604,24 +31361,15 @@ msgstr "Chat pribadi"
 msgid "Close tab"
 msgstr "Tutup tab"
 
+msgid "Logout"
+msgstr "Keluar"
+
 msgid "Clear log"
 msgstr "Hapus catatan"
 
 msgid "Show users on map"
 msgstr "Tampilkan pengguna pada peta"
 
-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 "Hanya posisi"
 
@@ -31712,6 +31460,9 @@ msgstr "Import Globalstat"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Import Data dari Globalsat Datalogger DG100 kedalam layer GPX."
 
+msgid "Import"
+msgstr "import"
+
 msgid "GPS Blams"
 msgstr "GPS Blams"
 
@@ -32132,10 +31883,10 @@ msgid "Export file system path already exists but is not a directory."
 msgstr ""
 
 msgid "Failed to create export directory: {0}"
-msgstr ""
+msgstr "Gagal membuat direktori ekspor: {0}"
 
 msgid "Failed to create export directory."
-msgstr ""
+msgstr "Gagal membuat direktori ekspor."
 
 msgid "Append cache name"
 msgstr ""
@@ -32156,7 +31907,7 @@ msgid "File system path the tiles are exported to."
 msgstr ""
 
 msgid "Export directory:"
-msgstr ""
+msgstr "Direktori ekspor:"
 
 msgid "Append cache name to export directory."
 msgstr ""
@@ -32445,15 +32196,33 @@ msgid "Opens up a wizard to create a concourse"
 msgstr ""
 
 msgid "Vertical layer:"
-msgstr ""
+msgstr "Layer vertical:"
 
 msgid "Structure type:"
-msgstr ""
+msgstr "Tipe struktur:"
 
 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"
@@ -32484,33 +32253,94 @@ msgid "Sets the ref tag when the room-object is selected."
 msgstr ""
 
 msgid "Apply Tags"
+msgstr "Terapkan Tag"
+
+msgid "Add a new level"
+msgstr ""
+
+msgid ""
+"<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 "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 "Fitting"
+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 ""
-"<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>"
+"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 "Level Selection"
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
 msgstr ""
 
-msgid "Lowest Level"
+msgid "INNER"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
 msgstr ""
 
-msgid "Highest Level"
-msgstr "Tingkat tertinggi"
+msgid "Deactivate multipolygon function."
+msgstr ""
 
-msgid "The highest level of your building."
-msgstr "Tingkat tertinggi dari bangunan."
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+msgid "Working level: {0}"
 msgstr ""
 
 msgid "InfoMode"
@@ -32685,10 +32515,10 @@ msgid "Check direction of streams"
 msgstr "Periksa arah aliran sungai."
 
 msgid "Check direction of streams and rivers"
-msgstr ""
+msgstr "Periksa arah aliran sungai"
 
 msgid "No more directions to check!"
-msgstr ""
+msgstr "Tidak ada lagi arah untuk dicek!"
 
 msgid "Replace way"
 msgstr ""
@@ -33678,6 +33508,27 @@ msgstr "Ekstensi berkas tidak diketahui: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Gagal mengurai berkas ''{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"
 
@@ -33951,11 +33802,12 @@ msgid "Retry"
 msgstr "Coba lagi"
 
 msgid "Unable to process file ''{0}'':"
-msgstr ""
+msgstr "Tidak dapat memproses file \"{0}\":"
 
 msgid ""
 "Writing position information to image files... Estimated time left: {0}"
 msgstr ""
+"Menulis informasi posisi ke dalam file gambar... Perkiraan waktu tersisa: {0}"
 
 msgid "File could not be deleted!"
 msgstr "Berkas tidak dapat dihapus!"
@@ -33964,7 +33816,7 @@ msgid "Could not rename file!"
 msgstr "Tidak dapat mengganti nama berkas!"
 
 msgid "Could not rename file {0} to {1}!"
-msgstr ""
+msgstr "Tidak dapat mengganti nama file {0} hingga {1}!"
 
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
 msgstr "<html><h3> Terdapat data backup lama didalam direktori gambar!</h3>"
@@ -33988,7 +33840,7 @@ msgid "Test failed: Could not write mtime."
 msgstr "Tes gagal: Tidak dapat menulis mtime"
 
 msgid "Adjust photos"
-msgstr ""
+msgstr "Sesuaikan foto"
 
 msgid "Move and position photos"
 msgstr ""
@@ -34007,7 +33859,7 @@ msgid "Edit photo GPS data"
 msgstr "Edit data foto GPS"
 
 msgid "Edit GPS data of selected photo."
-msgstr ""
+msgstr "Edit data GPS dari foto terpilih"
 
 msgid "Edit Photo GPS Data"
 msgstr "Edit data foto GPS"
@@ -34015,6 +33867,9 @@ msgstr "Edit data foto GPS"
 msgid "Please select an image first."
 msgstr "Pertama silahkan pilih gambar"
 
+msgid "No image selected"
+msgstr "Tidak ada gambar terpilih"
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -34034,13 +33889,13 @@ msgid "altitude"
 msgstr "ketinggian"
 
 msgid "Altitude:"
-msgstr ""
+msgstr "Ketinggian:"
 
 msgid "speed"
 msgstr "kecepatan"
 
 msgid "positive number or empty"
-msgstr ""
+msgstr "angka positif atau kosong"
 
 msgid "Speed:"
 msgstr "Kecepatan:"
@@ -34052,7 +33907,7 @@ msgid "direction"
 msgstr "arah"
 
 msgid "range -360.0 .. 360.0, or empty"
-msgstr ""
+msgstr "rentang -360.0 .. 360.0, atau kosong"
 
 msgid "Direction:"
 msgstr "Arah:"
@@ -34061,7 +33916,7 @@ msgid "°"
 msgstr "°"
 
 msgid "Undo changes made in this dialog"
-msgstr ""
+msgstr "Batalkan perubahan dibuat di dialog ini"
 
 msgid "Reload GPS data from image file"
 msgstr "Muat ulang data GPS dari file gambar"
@@ -34076,7 +33931,7 @@ msgid "Do you want to save current calibration of layer {0}?"
 msgstr "Apakah anda ingin menyimpan kalibrasi saat ini dari layer {0}?"
 
 msgid "Select an option"
-msgstr ""
+msgstr "Pilih opsi"
 
 msgid "Load Picture Calibration..."
 msgstr "Mengunggah kalibrasi gambar..."
@@ -34136,7 +33991,7 @@ msgid ""
 msgstr ""
 
 msgid "Notification"
-msgstr ""
+msgstr "Notifikasi"
 
 msgid "PicLayer move"
 msgstr "PicLayer gerakan"
@@ -34253,7 +34108,7 @@ msgid "Do you want to apply it ?"
 msgstr "Apakah anda ingin menerapkan?"
 
 msgid "Load calibration file?"
-msgstr ""
+msgstr "Memuat file kalibrasi?"
 
 msgid "It will be applied automatically."
 msgstr "Ini akan diaplikasikan secara otomatis"
@@ -34759,6 +34614,9 @@ msgstr "Implisit"
 msgid "State"
 msgstr "Negara Bagian / Provinsi"
 
+msgid "pending"
+msgstr "Tunda"
+
 msgid "[incomplete]"
 msgstr "[Tidak Lengkap]"
 
@@ -34809,10 +34667,10 @@ msgid "Visualize public transport routes"
 msgstr ""
 
 msgid "Filters"
-msgstr ""
+msgstr "Filter"
 
 msgid "Choose Filter"
-msgstr ""
+msgstr "Pilih FIlter"
 
 msgid "JSlider initialization error. Make sure your meta-inf is correct."
 msgstr ""
@@ -34990,7 +34848,7 @@ msgid "Reverted changeset"
 msgstr "Perubahan yang telah dikembalikan"
 
 msgid "It is not allowed to revert changeset from {0}"
-msgstr ""
+msgstr "Tidak diperbolehkan menngembalikan changset dari {0}"
 
 msgid "Downloading objects history"
 msgstr "Mengunduh riwayat objek"
@@ -35181,12 +35039,6 @@ msgstr ""
 "Pengaturan \"{0}\" hilang/tidak ditemukan. Tidak dapat menginisialisasi "
 "SdsApi"
 
-msgid "Failed to open connection to API {0}."
-msgstr "Gagal untuk membuka koneksi 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>"
@@ -35473,7 +35325,7 @@ msgid "Undelete node {0}"
 msgstr "Batalkan hapus node {0}"
 
 msgid "OSM Export"
-msgstr ""
+msgstr "OSM Ekspor"
 
 msgid "Export traffic data to SUMO network file."
 msgstr ""
@@ -35550,12 +35402,6 @@ msgstr "Plugin Editor Tag JOSM"
 msgid "Presets"
 msgstr "Presets"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Keluar dari editing tag dan tutup dialog"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Terapkan tag yang telah diedit dan tutup dialog"
-
 msgid "Highlight"
 msgstr "Sorot"
 
@@ -35678,10 +35524,10 @@ msgid "Mark element done"
 msgstr ""
 
 msgid "Todo list"
-msgstr ""
+msgstr "Daftar yang harus dikerjakan"
 
 msgid "Open the todo list."
-msgstr ""
+msgstr "Buka dafta yang harus dikerjakan."
 
 msgid "Zoom to the selected item in the todo list."
 msgstr "Perbesar item yang dipilih dalam daftar yang harus dikerjakan"
@@ -35786,19 +35632,19 @@ msgid "Select a task ..."
 msgstr ""
 
 msgid "Setting default URL"
-msgstr ""
+msgstr "Atur URL default"
 
 msgid "Enter the new URL"
-msgstr ""
+msgstr "Masukkan URL baru"
 
 msgid "Setting new URL: "
-msgstr ""
+msgstr "Atur URL baru: "
 
 msgid "Set download area (m²)"
 msgstr "Atur daerah yang akan diunduh (m²)"
 
 msgid "~.02"
-msgstr ""
+msgstr "~.02"
 
 msgid "Tasks"
 msgstr ""
@@ -35807,7 +35653,7 @@ msgid "Config"
 msgstr "Konfigurasi"
 
 msgid "Activation"
-msgstr ""
+msgstr "Aktivasi"
 
 msgid "tofix:Skip item"
 msgstr ""
@@ -35869,7 +35715,7 @@ msgid "Tracer2."
 msgstr ""
 
 msgid "Change tag {0} to {1}"
-msgstr ""
+msgstr "Uubah tag {0} menjadi {1}"
 
 msgid ""
 "The Tracer2Server version isn''t compatible with this plugin. Please "
@@ -35907,7 +35753,7 @@ msgid "Mode:"
 msgstr "Mode:"
 
 msgid "Threshold:"
-msgstr ""
+msgstr "Ambang Batas:"
 
 msgid "Points per circle:"
 msgstr "Titik per lingkaran"
@@ -35916,7 +35762,7 @@ msgid "Tag:"
 msgstr "Tag:"
 
 msgid "Preferred values:"
-msgstr ""
+msgstr "Value yang disarankan:"
 
 msgid "Delete parameter \"{0}\"?"
 msgstr "Hapus parameter \"{0}\"?"
@@ -37270,48 +37116,6 @@ msgstr ""
 "Alat ini mengganti geometri dari satu objek dengan yang lain dan membutuhkan "
 "setidaknya 2 objek yang dipilih"
 
-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 ""
-"Alat ini hanya dapat mengganti node/titik, memperbaharui node/titik ke "
-"way/garis atau multipoligon, atau mengganti way/garis dengan way/garis"
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "Node yang termasuk kedalam way/garis, tidak dapat diganti"
-
-msgid "Replace geometry for node {0}"
-msgstr "Ganti geometri untuk node/titik {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-"Relasi bukan merupakan multipoligon, tidak bisa digunakan sebagai pengganti"
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Harap pilih satu way/garis yang ada pada database dan satu way/garis baru "
-"dengan geometri yang benar"
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "Way/garis harus seluruhnya berada di area yang terdownload"
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"Way/garis yang diganti tidak dapat mempunyai semua node/titik dengan "
-"kelompaok properti atau relasi kecuali dia termasuk kedalam kedua way/garis"
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"Melebihi batas iterasi untuk metode yang kuat, menggunakan metode yang lebih "
-"simpel"
-
-msgid "Replace geometry for way {0}"
-msgstr "Ganti geometri untuk way/garis {0}"
-
 msgid "Replace Membership"
 msgstr "Ganti keanggontaan"
 
@@ -37390,9 +37194,6 @@ msgstr "Pilih node/titik ditengah"
 msgid "Please select two nodes connected by way!"
 msgstr "Harap pilih dua node/titik yang terhubung oleh way/garis!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Terlalu banyak way/garis yang ditambahkan {0}!"
-
 msgid "All inside [testing]"
 msgstr "Semua didalam [Pengujian]"
 
diff --git a/i18n/po/is.po b/i18n/po/is.po
index db86aad..be4d3f8 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2015-11-06 00:32+0000\n"
 "Last-Translator: Stefán Örvar Sigmundsson <stefan.orvar.sigmundsson at emi.is>\n"
 "Language-Team: Icelandic <is at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:47+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:48+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: is\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -953,8 +953,8 @@ msgstr "Sláðu inn slóð (URL) skrárinnar sem þú vilt opna:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Sláðu inn slóð (URL) hvaðan gögnin ættu að vera sótt."
 
-msgid "Separate Layer"
-msgstr "Aðskilið lag"
+msgid "Download as new layer"
+msgstr "Sækja sem nýtt lag"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Veljð hvort sótt gögn ættu að vera sett í nýtt lag."
@@ -2262,12 +2262,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"
@@ -8274,9 +8274,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr "Sækja sem nýtt lag"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9736,6 +9733,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12788,9 +12788,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 ""
 
@@ -14487,6 +14484,10 @@ msgstr "Halda viðbótinni"
 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 ""
 
@@ -14496,10 +14497,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 "Gosbrunnur"
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Viti"
 
@@ -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 ""
 
@@ -27053,6 +27162,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 ""
@@ -27842,550 +27954,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 ""
 
@@ -29080,6 +28648,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 ""
 
@@ -29113,9 +28779,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 ""
 
@@ -29128,7 +28815,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:"
@@ -29807,6 +29503,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 ""
 
@@ -30301,6 +30009,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30333,22 +30044,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"
@@ -30438,6 +30140,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31127,7 +30832,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"
@@ -31160,31 +30883,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"
@@ -32265,6 +32049,27 @@ msgstr "Óþekkt skráarending: {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 ""
 
@@ -32598,6 +32403,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33335,6 +33143,9 @@ msgstr ""
 msgid "State"
 msgstr "Fylki"
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33745,12 +33556,6 @@ msgstr "Nýtt gildi fyrir {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>"
@@ -34087,12 +33892,6 @@ msgstr ""
 msgid "Presets"
 msgstr "Forstillingar"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35633,39 +35432,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 ""
 
@@ -35739,9 +35505,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/it.po b/i18n/po/it.po
index 2391c11..48f9d0a 100644
--- a/i18n/po/it.po
+++ b/i18n/po/it.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm 20081003\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-24 12:58+0000\n"
 "Last-Translator: Moire <Unknown>\n"
 "Language-Team: Italian <talk-it at lists.openstreetmap.org>\n"
@@ -12,8 +12,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:49+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:49+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: it\n"
 "X-Language: it_IT\n"
 "X-Source-Language: en\n"
@@ -1041,8 +1041,8 @@ msgstr "Inserisci URL da scaricare:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Inserire un indirizzo URL dal quale devono essere scaricati i dati"
 
-msgid "Separate Layer"
-msgstr "Livello separato"
+msgid "Download as new layer"
+msgstr "Scarica come nuovo livello"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Selezionare se i dati devono essere scaricati in un nuovo livello"
@@ -2499,12 +2499,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"
@@ -9102,9 +9102,6 @@ msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 "Per la longitudine è richiesto un valore nell''intervallo [-180,180]."
 
-msgid "Download as new layer"
-msgstr "Scarica come nuovo livello"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10797,6 +10794,9 @@ msgstr "Nessun dato trovato nel file ''{0}''."
 msgid "Open OSM file"
 msgstr "Apri file OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -14201,9 +14201,6 @@ msgstr "Controllo remoto"
 msgid "Settings for the remote control feature."
 msgstr "Impostazioni per la funzionalità di controllo remoto."
 
-msgid "Download objects to new layer"
-msgstr "Scarica gli oggetti su un nuovo livello"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Conferma manualmente tutte le azioni del controllo remoto"
 
@@ -16182,6 +16179,12 @@ msgstr "Mantieni estensione"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Cliccare per mantenere l''estensione ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Fallita l''installazione dell''estensione ''{0}'' dal file di scaricamento "
+"temporaneo ''{1}''. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Fallita l''eliminazione del plugin obsoleto ''{0}''."
 
@@ -16194,12 +16197,6 @@ msgstr ""
 "dell''estensione."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Fallita l''installazione dell''estensione ''{0}'' dal file di scaricamento "
-"temporaneo ''{1}''. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -18218,10 +18215,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "chiosco"
-
 msgid "Start date"
 msgstr "Data di inizio"
 
@@ -19734,6 +19727,9 @@ msgstr "Bio Diesel"
 msgid "Octane 80"
 msgstr "80 ottani"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "91 ottani"
 
@@ -19755,6 +19751,9 @@ msgstr "E10 (miscela 10% etanolo)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (miscela 85% etanolo)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GPL (gas di petrolio liquefatto)"
 
@@ -22411,6 +22410,12 @@ msgstr "Fontana"
 msgid "Water Well"
 msgstr "Pozzo"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Faro"
 
@@ -25507,6 +25512,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"
 
@@ -25588,7 +25620,7 @@ msgstr "OSM Inspector: Indirizzi"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM Inspector: Linea di costa (EU)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -25603,7 +25635,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 ""
@@ -25611,21 +25643,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 ""
 
@@ -25764,13 +25818,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"
@@ -25803,14 +25857,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 ""
@@ -25876,7 +25930,7 @@ msgstr "VoGIS: Piano di destinazione del terreno"
 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"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -25963,13 +26017,13 @@ msgstr "TEC fermate di autobus"
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "Benin: Cotonou Pleiade 2016"
 
-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)"
@@ -26138,34 +26192,33 @@ msgstr "Immagini aeree di alta qualità della Città di Kelowna"
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna strade in sovraimpressione"
 
-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 ""
@@ -26173,7 +26226,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)"
@@ -26221,7 +26274,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -26229,7 +26282,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 ""
@@ -26399,8 +26452,7 @@ msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr "Metropole Ruhr: Antenne (10 cm)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -26408,9 +26460,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 ""
@@ -26418,10 +26468,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"
@@ -26454,57 +26504,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 ""
@@ -26512,13 +26557,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 ""
@@ -26586,13 +26631,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 ""
@@ -26600,7 +26645,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -26608,7 +26653,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -26616,19 +26661,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 ""
@@ -26733,13 +26778,13 @@ msgstr "Japan GSI ortho Imagery"
 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 ""
@@ -26747,7 +26792,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)"
@@ -26841,13 +26886,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 ""
 
@@ -26935,6 +26973,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 ""
 
@@ -26943,6 +26995,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 ""
 
@@ -26950,13 +27026,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 ""
@@ -26970,7 +27046,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 ""
@@ -26978,29 +27054,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)"
@@ -27069,7 +27144,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"
@@ -27102,6 +27180,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 ""
 
@@ -27150,33 +27234,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 ""
@@ -27184,7 +27266,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)"
@@ -27230,25 +27312,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"
@@ -27272,7 +27354,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)"
@@ -27368,7 +27450,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 ""
@@ -27376,6 +27458,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"
 
@@ -27394,7 +27483,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)"
@@ -27459,7 +27548,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "U.S. Forest Service strade"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -27467,13 +27556,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)"
@@ -27560,7 +27649,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 ""
@@ -27568,7 +27664,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"
@@ -27583,6 +27679,12 @@ msgstr "Ucraina - Kiev 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"
 
@@ -28608,46 +28710,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}: predefinito in metri; separatore punto; se unità, inserire spazio e "
-"dopo unità"
 
 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 "formato {0} inusuale"
+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 ""
 "la tensione dovrebbe essere espressa in volt senza unità/delimitatori/spazi"
 
-msgid "unusual {0} specification"
-msgstr "specifica {0} inusuale"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "scartamento ferroviario inusuale; utilizzare mm senza separatore"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr "pendenza inusuale; utilizzare percentule/gradi oppure up/down"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} deve essere un valore numerico"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} deve essere un numero intero positivo"
 
-msgid "unusual value of {0}"
-msgstr ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -28754,6 +28847,9 @@ msgstr "Nascondi icone a bassi livelli di zoom"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Simboli di nodo meno ingombranti a bassi livelli di zoom"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Mostra etichette delle strade (ad alta livello di zoom)"
 
@@ -28805,6 +28901,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."
@@ -28852,6 +28951,9 @@ msgstr ""
 "personalizzati. Consulta il collegamento per i comandi standard (arc, circle "
 "etc.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -28907,6 +29009,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Gestione degli EPCI francesi (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Usa script esterni in JOSM"
 
@@ -29122,6 +29229,9 @@ msgstr ""
 "Permette l''apertura di file gpx/osm che intersecano l''area dello schermo "
 "attualmente visualizzata"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -30003,550 +30113,6 @@ msgstr "Importa immagine georeferenziata"
 msgid "Error while creating image layer: "
 msgstr "Errore durante la creazione del livello immagine: "
 
-msgid "Mapillary Images"
-msgstr "Immagini Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Livelli 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 "Scarica immagini Mapillary nella vista corrente"
-
-msgid "Export pictures"
-msgstr "Esporta foto"
-
-msgid "Export Mapillary pictures"
-msgstr "Esporta foto Mapillary"
-
-msgid "Export images"
-msgstr "Esporta immagni"
-
-msgid "Import pictures"
-msgstr "Importa immagini"
-
-msgid "Import local pictures"
-msgstr "Importa foto locali"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Importa foto nel livello Mapillary"
-
-msgid "Join mode"
-msgstr "modalità unisci"
-
-msgid "Join/unjoin pictures"
-msgstr "unisci/dividi foto"
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr "in sospeso"
-
-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 "Modalità camminata"
-
-msgid "Zoom to selected image"
-msgstr "Ingrandisci l''immagine selezionata"
-
-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 "Esporta tutte le immagini"
-
-msgid "Export selected sequence"
-msgstr ""
-
-msgid "Export selected images"
-msgstr "Esporta le immagini selezionate"
-
-msgid "Rewrite imported images"
-msgstr ""
-
-msgid "Select a directory"
-msgstr "Selezionare una cartella"
-
-msgid "Explore"
-msgstr "Esplora"
-
-msgid "Speed limit"
-msgstr "Limite di velocità"
-
-msgid "Give way"
-msgstr "Dare la precedenza"
-
-msgid "No entry"
-msgstr "Divieto di accesso"
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr ""
-
-msgid "Uneven road"
-msgstr ""
-
-msgid "No parking"
-msgstr "Divieto di parcheggio"
-
-msgid "No overtaking"
-msgstr "Divieto di sorpasso"
-
-msgid "Pedestrian crossing"
-msgstr "Strisce pedonali"
-
-msgid "No turn"
-msgstr "Divieto di svolta"
-
-msgid "Years"
-msgstr "Anni"
-
-msgid "Months"
-msgstr "Mesi"
-
-msgid "Days"
-msgstr "Giorni"
-
-msgid "Imported images"
-msgstr "Immagini importate"
-
-msgid "Mapillary filter"
-msgstr ""
-
-msgid "Open Mapillary filter dialog"
-msgstr ""
-
-msgid "Not older than: "
-msgstr "Non più vecchio di: "
-
-msgid "Downloaded images"
-msgstr "Immagini scaricate"
-
-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 "Nessuna immagine selezionata"
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr ""
-
-msgid "Open Mapillary window"
-msgstr ""
-
-msgid "Next picture"
-msgstr "Immagine successiva"
-
-msgid "Shows the next picture in the sequence"
-msgstr ""
-
-msgid "Previous picture"
-msgstr "Immagine precedente"
-
-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 "Metti in pausa"
-
-msgid "Pauses the walk."
-msgstr ""
-
-msgid "Display hour when the picture was taken"
-msgstr "Mostra l''ora in cui è stata scattata la foto"
-
-msgid "Use 24 hour format"
-msgstr "Utilizza il formato a 24 ore"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-
-msgid "Preview images when hovering its icon"
-msgstr "Anteprima delle immagini quando il mouse passa sopra la loro icona"
-
-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 "Sei collegato come ''{0}''."
-
-msgid "You are currently not logged in."
-msgstr "Non sei autenticato."
-
-msgid "Login"
-msgstr "Accedi"
-
-msgid "Logout"
-msgstr "Esci"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-
-msgid "Upload selected sequence"
-msgstr ""
-
-msgid "Delete after upload"
-msgstr "Cancella dopo il caricamento"
-
-msgid "Wait for full quality pictures"
-msgstr ""
-
-msgid "Follow selected image"
-msgstr ""
-
-msgid "Go forward"
-msgstr "Procedi"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr "Importa"
-
-msgid "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 "Seleziona l’immagine da importare"
-
-msgid "All images in a directory"
-msgstr "Tutte le immagini di una cartella"
-
-msgid "Select directory to import images from"
-msgstr "Seleziona la cartella da cui importare le immagini"
-
-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 "Info immagine"
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-
-msgid "Show detections on top of image"
-msgstr ""
-
-msgid "View in browser"
-msgstr "Vedi nel browser"
-
-msgid "Copy key"
-msgstr "Copia chiave"
-
-msgid "Add Mapillary tag"
-msgstr "Aggiungi etichetta Mapillary"
-
-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 "oggetti di Mapillary"
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] "Immagine {0} cancellata"
-msgstr[1] "Immagini {0} cancellate"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "Immagine {0} importata"
-msgstr[1] "Immagini {0} importate"
-
-msgid "2 images joined"
-msgstr "2 imagini unite"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "Spostata {0} immagine"
-msgstr[1] "Spostate {0} immagini"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "2 images unjoined"
-msgstr "2 imagini separate"
-
-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 "tutto nell’area visibile"
-
-msgid "areas with downloaded OSM-data"
-msgstr ""
-
-msgid "only when manually requested"
-msgstr "solo quando richiesto manualmente"
-
-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 "Download in corso"
-
-msgid "Select mode"
-msgstr "Modalità Selezione"
-
-msgid "Mapillary login"
-msgstr "login di Mapillary"
-
-msgid "Login successful, return to JOSM."
-msgstr "Autenticazione riuscita, ritorno a JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Formati grafici supportati (JPG e PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr ""
-
-msgid "Total Mapillary images: {0}"
-msgstr "Immagini Mapillary totali: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr "Nessuna immagine trovata"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr "Caricamento terminato"
-
-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 "In caricamento: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -31378,6 +30944,117 @@ 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 ""
+"Questo strumento può solamente sostituire un nodo, trasformare un nodo in un "
+"percorso o un multi-poligono, oppure sostituire un percorso con un altro "
+"percorso."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "Nodo appartenente a percorso(i), impossibile sostituire."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+"La relazione non è un multi-poligono, non può essere utilizzata come "
+"sostituzione."
+
+msgid "Replace geometry for node {0}"
+msgstr "Sostituisci dimensioni e posizione per il nodo {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Si prega di selezionare un percorso esistente nella base dati ed un nuovo "
+"percorso avente dimensioni e posizione corrette."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr ""
+"I percorsi devono essere interamente all''interno dell''area scaricata."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"Il percorso da sostituire non deve avere alcun nodo contenente proprietà o "
+"appartenenze a relazioni, a meno che essi non appartengano ad entrambi i "
+"percorsi."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"È stato superato il limite di iterazioni per il metodo robusto, utilizzo il "
+"metodo più semplice."
+
+msgid "Replace geometry for way {0}"
+msgstr "Sostituisci dimensioni e posizione del percorso {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Sono stati aggiunti troppi percorsi: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -31412,9 +31089,30 @@ msgid "Cannot place building outside of the world."
 msgstr ""
 "Impossibile posizionare l''edificio al di fuori dei confini della Terra."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Crea edificio"
 
+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 "Imposta dimensione degli edifici"
 
@@ -31427,8 +31125,17 @@ msgstr "Selezione Automatica Edifici"
 msgid "Use address nodes under buildings"
 msgstr "Utilizza i nodi di indirizzo sotto gli edifici"
 
-msgid "Buildings width:"
-msgstr "Larghezza edifici:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Lunghezza del passo:"
@@ -32187,6 +31894,18 @@ msgstr "Elimina lo schema selezionato nella lista."
 msgid "Color Schemes"
 msgstr "Schemi di colore"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Annulla la modifica all''etichetta e chiudi la finestra"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Applica le etichette modificate e chiudi la finestra"
+
 msgid "Conflation"
 msgstr "Fusione"
 
@@ -32685,6 +32404,9 @@ msgstr "Apri il pannello GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Ingrandisci la visuale per vedere i messaggi"
 
+msgid "Login"
+msgstr "Accedi"
+
 msgid "Enable autologin"
 msgstr "Abilita accesso automatico"
 
@@ -32717,24 +32439,15 @@ msgstr "Chat privata"
 msgid "Close tab"
 msgstr "Chiudi scheda"
 
+msgid "Logout"
+msgstr "Esci"
+
 msgid "Clear log"
 msgstr "Azzera registro"
 
 msgid "Show users on map"
 msgstr "Visualizza utenti sulla mappa"
 
-msgid "GeoJSON file"
-msgstr "File GeoJSON"
-
-msgid "Loading json file..."
-msgstr "Caricamento di file json..."
-
-msgid "Data Layer from GeoJSON: "
-msgstr "Livello Dati da GeoJSON: "
-
-msgid "Error loading geojson file {0}"
-msgstr ""
-
 msgid "Position only"
 msgstr "Solo posizione"
 
@@ -32825,6 +32538,9 @@ msgstr "Importazione Globalsat"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importa dati da Globalsat Datalogger DG100 in un livello GPX."
 
+msgid "Import"
+msgstr "Importa"
+
 msgid "GPS Blams"
 msgstr "GPS Blams"
 
@@ -33582,7 +33298,25 @@ msgstr "Tipo di struttura:"
 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"
@@ -33615,31 +33349,92 @@ msgstr ""
 msgid "Apply Tags"
 msgstr "Applica i Tag"
 
-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 "Indoor Mapping Helper"
 msgstr ""
 
-msgid "Level Selection"
-msgstr "selezione del Livello"
+msgid "Toolbox for indoor mapping assistance"
+msgstr ""
 
-msgid "Lowest Level"
-msgstr "Livello più Basso"
+msgid "Insert level"
+msgstr ""
 
-msgid "The lowest level of your building."
-msgstr "Il livello più basso del tuo edificio."
+msgid "Add a new level to layer."
+msgstr ""
 
-msgid "Highest Level"
-msgstr "Livello più Alto"
+msgid "<html><b>?</strong></b>"
+msgstr ""
 
-msgid "The highest level of your building."
-msgstr "Il livello più alto del tuo edificio."
+msgid "Show Help-Browser."
+msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+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"
@@ -34828,6 +34623,27 @@ msgstr "Estensione del file sconosciuta: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Analisi del file \"{0}\" fallita"
 
+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"
 
@@ -35169,6 +34985,9 @@ msgstr "Modifica i Dati GPS della Foto"
 msgid "Please select an image first."
 msgstr "Prima è necessario seelzionare un''immagine."
 
+msgid "No image selected"
+msgstr "Nessuna immagine selezionata"
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -35920,6 +35739,9 @@ msgstr "implicito"
 msgid "State"
 msgstr "Regione"
 
+msgid "pending"
+msgstr "in sospeso"
+
 msgid "[incomplete]"
 msgstr "[incompleto]"
 
@@ -36347,12 +36169,6 @@ msgstr "Nuovo valore per {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr "Preferenza ''{0}'' mancante. Impossibile inizializzare SdsApi."
 
-msgid "Failed to open connection to API {0}."
-msgstr "È fallita l''apertura della connessione alle API {0}"
-
-msgid "Proxy Authentication Required"
-msgstr "È richiesta l''autenticazione sul 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>"
@@ -36722,12 +36538,6 @@ msgstr "Estensione JOSM per la modifica delle etichette"
 msgid "Presets"
 msgstr "Preimpostazioni"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Annulla la modifica all''etichetta e chiudi la finestra"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Applica le etichette modificate e chiudi la finestra"
-
 msgid "Highlight"
 msgstr "In evidenza"
 
@@ -38479,52 +38289,6 @@ msgstr ""
 "Questo strumento sostituisce un oggetto con un altro, e quindi necessita la "
 "selezione di due oggetti."
 
-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 ""
-"Questo strumento può solamente sostituire un nodo, trasformare un nodo in un "
-"percorso o un multi-poligono, oppure sostituire un percorso con un altro "
-"percorso."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "Nodo appartenente a percorso(i), impossibile sostituire."
-
-msgid "Replace geometry for node {0}"
-msgstr "Sostituisci dimensioni e posizione per il nodo {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-"La relazione non è un multi-poligono, non può essere utilizzata come "
-"sostituzione."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Si prega di selezionare un percorso esistente nella base dati ed un nuovo "
-"percorso avente dimensioni e posizione corrette."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr ""
-"I percorsi devono essere interamente all''interno dell''area scaricata."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"Il percorso da sostituire non deve avere alcun nodo contenente proprietà o "
-"appartenenze a relazioni, a meno che essi non appartengano ad entrambi i "
-"percorsi."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"È stato superato il limite di iterazioni per il metodo robusto, utilizzo il "
-"metodo più semplice."
-
-msgid "Replace geometry for way {0}"
-msgstr "Sostituisci dimensioni e posizione del percorso {0}"
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -38603,9 +38367,6 @@ msgstr "Seleziona i nodi intermedi"
 msgid "Please select two nodes connected by way!"
 msgstr "Selezionare due nodi connessi da un percorso!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Sono stati aggiunti troppi percorsi: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Tutto il contenuto [test]"
 
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index cb46e80..116295b 100644
--- a/i18n/po/ja.po
+++ b/i18n/po/ja.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-30 17:28+0000\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-04 09:15+0000\n"
 "Last-Translator: fujimoto <fujimoto at internet.ne.jp>\n"
 "Language-Team: Japanese <tr at openstreetmap.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:49+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:49+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "X-Poedit-Country: JAPAN\n"
 "Language: ja\n"
 "X-Poedit-Language: Japanese\n"
@@ -62,7 +62,7 @@ msgid "Opening link not supported on current platform (''{0}'')"
 msgstr "リンクを開く操作は、このプラットフォームでは対応していません(''{0}'')"
 
 msgid "Failed to save default preferences."
-msgstr "既定の設定の保存に失敗しました。"
+msgstr "既定値の設定の保存に失敗しました。"
 
 msgid "About"
 msgstr "バージョン情報"
@@ -357,7 +357,7 @@ msgid "Copy Coordinates"
 msgstr "座標をコピー"
 
 msgid "Copy coordinates of selected nodes to clipboard."
-msgstr "選択したノードの座標をクリップボードにコピーします"
+msgstr "選択したノードの座標をクリップボードにコピーします。"
 
 msgid "Create Circle"
 msgstr "円形を作成"
@@ -446,7 +446,7 @@ msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "直線に沿って、選択したノードを等間隔に配置します。"
 
 msgid "Ignoring {0} nodes with null coordinates"
-msgstr "座標を持たない{0}件のノードを無視"
+msgstr "座標を持たない {0} 件のノードを無視"
 
 msgid ""
 "Please select :\n"
@@ -461,7 +461,7 @@ msgid "Download data"
 msgstr "データのダウンロード"
 
 msgid "Download map data from a server of your choice"
-msgstr "あなたが選択したサーバから地図データをダウンロード"
+msgstr "あなたが選択したサーバーから地図データをダウンロード"
 
 msgid ""
 "<html>This action will require {0} individual<br>download requests. Do you "
@@ -475,7 +475,7 @@ msgid "Download in current view"
 msgstr "現在のビューにダウンロード"
 
 msgid "Download map data from the OSM server in current view"
-msgstr "現在のビューに OSM サーバから地図データをダウンロードします"
+msgstr "現在のビューに OSM サーバーから地図データをダウンロードします"
 
 msgid "Download object..."
 msgstr "オブジェクトをダウンロード..."
@@ -964,8 +964,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 "新しいレイヤーにデータをダウンロードするなら選択"
@@ -1032,8 +1032,9 @@ msgid ""
 "undesirable results when doing rectangular alignments.<br>Change your "
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
-"<html>現在EPSG:4326投影法を使用しています。これは、長方形整列を行うと<br>望ましくない結果を引き起こすかもしれません。<br>この警告を"
-"消すには、投影法を変更してください。<br>続けますか?</html>"
+"<html>現在 EPSG:4326 "
+"投影法を使用しており、長方形整列を行うと<br>望ましくない結果を引き起こすかもしれません。<br>この警告を消すには、投影法を変更してください。<br>"
+"続けますか?</html>"
 
 msgid "Orthogonalize"
 msgstr "直交化"
@@ -1266,7 +1267,7 @@ msgstr "動作ログ"
 
 msgid ""
 "Show status report with useful information that can be attached to bugs"
-msgstr "バグに添付できる有用な情報と一緒にステータスレポートを表示する"
+msgstr "バグ報告に添付できる有用な情報と共に動作ログを表示する"
 
 msgid "Help: {0}"
 msgstr "ヘルプ: {0}"
@@ -1583,13 +1584,13 @@ msgid "Upload notes"
 msgstr "メモをアップロード"
 
 msgid "Uploading notes to server"
-msgstr "メモをサーバーにアップロード"
+msgstr "メモをサーバーへアップロード"
 
 msgid "Upload selection"
 msgstr "選択をアップロード"
 
 msgid "Upload all changes in the current selection to the OSM server."
-msgstr "選択しているオブジェクトの変更を全てアップロード"
+msgstr "選択中のすべての変更を OSM サーバーへアップロード"
 
 msgid "Checking parents for deleted objects"
 msgstr "親の削除済みオブジェクトをチェック中"
@@ -1816,7 +1817,7 @@ msgid "No data found in this area."
 msgstr "この範囲ではデータは見つかりません"
 
 msgid "OSM Server URL:"
-msgstr "OSMサーバーのURL:"
+msgstr "OSM サーバーのURL:"
 
 msgid "Command"
 msgstr "コマンド"
@@ -1883,7 +1884,7 @@ msgid ""
 "Click <strong>{0}</strong> to check the state of this object on the server."
 msgid_plural ""
 "Click <strong>{0}</strong> to check the state of these objects on the server."
-msgstr[0] "<strong>{0}</strong> をクリックしてサーバー上のこのオブジェクトの状態をチェック。"
+msgstr[0] "サーバー上のこのオブジェクトの状態をチェックするには <strong>{0}</strong> をクリックしてください。"
 
 msgid "Click <strong>{0}</strong> to ignore.</html>"
 msgstr "無視するには<strong>{0}</strong>をクリックしてください。</html>"
@@ -2272,12 +2273,12 @@ msgstr "最後のメンバーからGPXレイヤーに変換"
 
 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"
@@ -3012,14 +3013,14 @@ msgstr "既存の設定ファイル ''{0}'' を既定の設定ファイルで置
 msgid ""
 "<html>Failed to initialize preferences.<br>Failed to reset preference file "
 "to default: {0}</html>"
-msgstr "<html>設定の初期化に失敗しました。<br>設定ファイルをデフォルト: {0} にリセットできません</html>"
+msgstr "<html>設定の初期化に失敗しました。<br>設定ファイルを既定値 {0} にリセットできません</html>"
 
 msgid ""
 "<html>Preferences file had errors.<br> Making backup of old one to "
 "<br>{0}<br> and creating a new default preference file.</html>"
 msgstr ""
-"<html>設定ファイルにはエラーがあります。<br>古いもののバックアップを<br>{0}<br>に取って、新しい初期設定ファイルを作ります。</htm"
-"l>"
+"<html>設定ファイルにエラーがあります。<br>古いファイルのバックアップを<br>{0}<br>に作成して、既定値で新しい設定ファイルを作ります。<"
+"/html>"
 
 msgid ""
 "Failed to initialize preferences. Failed to reset preference file to "
@@ -3027,10 +3028,10 @@ msgid ""
 msgstr "設定の初期化に失敗しました。設定ファイル {0} を既定値にリセットできませんでした。"
 
 msgid "Failed to load defaults cache file: {0}"
-msgstr ""
+msgstr "既定値のキャッシュファイルの読み込みに失敗しました: {0}"
 
 msgid "Failed to delete faulty defaults cache file: {0}"
-msgstr ""
+msgstr "既定値のキャッシュファイルの削除に失敗しました: {0}"
 
 msgid "Layer: {0}"
 msgstr "レイヤー: {0}"
@@ -3105,7 +3106,7 @@ msgid "Decimal Degrees"
 msgstr "十進経緯度"
 
 msgid "Unable to parse as coordinate value: ''{0}''"
-msgstr ""
+msgstr "''{0}'' は座標の値として解釈できませんでした"
 
 msgid "deg° min'' (Nautical)"
 msgstr "度° 分'' (Nautical)"
@@ -3120,13 +3121,13 @@ msgid "This imagery is marked as best in this region in other editors."
 msgstr "この画像は他の編集者からこの地域の最良の画像とマークされています。"
 
 msgid "{0} mirror server {1}"
-msgstr "{0}のミラーサーバ{1}"
+msgstr "{0} のミラーサーバー{1}"
 
 msgid "{0} mirror server"
-msgstr "{0}台のミラーサーバ"
+msgstr "{0} のミラーサーバー"
 
 msgid "Update default entries"
-msgstr "既定のエントリを更新"
+msgstr "既定の項目を更新"
 
 msgid "Update imagery ''{0}''"
 msgstr "画像 ''{0}'' を更新"
@@ -3178,12 +3179,12 @@ msgstr "WMTS パーサエラー - 開始要素 {0} が終了要素 {2} の名前
 msgid ""
 "Can''t use layer {0} because no supported formats where found. Layer is "
 "available in formats: {1}"
-msgstr ""
+msgstr "対応していないファイル形式であるため、レイヤー {0} を使用できません。レイヤーは {1} のファイル形式で利用可能です。"
 
 msgid ""
 "Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
 "identifier {2}"
-msgstr "正方形のタイルのみに対応しています。 TileMatrix identifier {2} のサーバが{0}x{1}を返しました。"
+msgstr "正方形のタイルのみに対応しています。 TileMatrix identifier {2} のサーバーが{0}x{1}を返しました。"
 
 msgid "Failed to retrieve OAuth Access Token from credential manager"
 msgstr "認証マネージャーからOAuthアクセストークンの取得に失敗しました"
@@ -3561,7 +3562,7 @@ msgid "<html>Failed to create missing preferences directory: {0}</html>"
 msgstr ""
 
 msgid "Failed to create missing user data directory: {0}"
-msgstr ""
+msgstr "存在しないユーザーデータディレクトリ {0} の作成に失敗しました"
 
 msgid "<html>Failed to create missing user data directory: {0}</html>"
 msgstr "<html>存在しないユーザーデータディレクトリ {0} の作成に失敗しました。</html>"
@@ -3603,7 +3604,7 @@ msgid "by {0}"
 msgstr "({0}作成)"
 
 msgid "JOSM default (MapCSS)"
-msgstr "JOSM標準(MapCSS)"
+msgstr "JOSM 標準 (MapCSS)"
 
 msgid ""
 "Internal style to be used as base for runtime switchable overlay styles"
@@ -3619,7 +3620,7 @@ msgid "Internal Preset"
 msgstr "内部プリセット"
 
 msgid "The default preset for JOSM"
-msgstr "JOSM用の既定値のプリセット"
+msgstr "JOSM の既定のプリセット"
 
 msgid "Addresses"
 msgstr "住所"
@@ -3676,10 +3677,10 @@ msgid "Checks for errors on relations"
 msgstr "リレーションのエラーをチェックします"
 
 msgid "Territories"
-msgstr ""
+msgstr "地域固有"
 
 msgid "Checks for territories-specific features"
-msgstr ""
+msgstr "地域固有の地物をチェックします"
 
 msgid "Unnecessary tags"
 msgstr "不要なタグ"
@@ -3777,7 +3778,7 @@ msgid "Description"
 msgstr "説明"
 
 msgid "Converts coordinates from one coordinate reference system to another."
-msgstr ""
+msgstr "ある座標系の座標を他の座標系に変換します。"
 
 msgid "Options"
 msgstr "オプション"
@@ -3789,10 +3790,10 @@ msgid "Switch input and output crs"
 msgstr ""
 
 msgid "Switch order of input coordinates (east/north, lon/lat)"
-msgstr ""
+msgstr "入力座標の順序を入れ替える (東/北, 緯度/経度)"
 
 msgid "Switch order of output coordinates (east/north, lon/lat)"
-msgstr ""
+msgstr "出力座標の順序を入れ替える (東/北, 緯度/経度)"
 
 msgid "<crs>"
 msgstr "<crs>"
@@ -3803,7 +3804,7 @@ msgid ""
 msgstr ""
 
 msgid "[file]"
-msgstr ""
+msgstr "[ファイル]"
 
 msgid ""
 "Reads input data from one or more files listed as positional arguments. When "
@@ -3816,10 +3817,10 @@ msgstr "例"
 
 msgid ""
 "Expected two coordinates, separated by white space, found {0} in ''{1}''"
-msgstr ""
+msgstr "空白で区切って2つの座標が必要です。''{1}'' が {0} になっています。"
 
 msgid "Unable to parse number ''{0}''"
-msgstr ""
+msgstr "数値 ''{0}'' を解釈できません"
 
 msgid "GRS80"
 msgstr "GRS80"
@@ -3968,13 +3969,13 @@ msgid "Way contains more than {0} nodes. It should be split or simplified"
 msgstr "ウェイに{0}個以上のノードがあります。分割または単純化してください"
 
 msgid "Barriers and entrances"
-msgstr "柵と出入口"
+msgstr "障害物と出入口"
 
 msgid "Checks for errors in barriers and entrances."
-msgstr "柵と出入口のエラーをチェックする。"
+msgstr "障害物と出入口のエラーをチェックします。"
 
 msgid "Barrier entrance not set on a barrier"
-msgstr "柵の出入口が柵の上に設定されていない"
+msgstr "障害物上にない障害物の出入口"
 
 msgid "Coastlines"
 msgstr "海岸線"
@@ -4031,7 +4032,7 @@ msgid "Crossing boundaries"
 msgstr "交差している境界"
 
 msgid "Crossing barriers"
-msgstr "交差している柵"
+msgstr "交差している障壁"
 
 msgid "Self crossing"
 msgstr "自分自身が交差しているもの"
@@ -4803,7 +4804,7 @@ msgid "Offline mode"
 msgstr "オフラインモード"
 
 msgid "Internal Server Error"
-msgstr "サーバーの内部エラー"
+msgstr "サーバー内部エラー"
 
 msgid "Bad Request"
 msgstr "不正なリクエスト"
@@ -4830,7 +4831,7 @@ msgid "Bandwidth Limit Exceeded"
 msgstr "帯域制限を超えました"
 
 msgid "Communication with OSM server failed"
-msgstr "OSMサーバーとの通信に失敗"
+msgstr "OSM サーバーとの通信に失敗"
 
 msgid "Authentication failed"
 msgstr "認証失敗"
@@ -4896,7 +4897,7 @@ msgid "Would you like to update now ?"
 msgstr "今すぐ更新しますか?"
 
 msgid "Starting file watcher"
-msgstr ""
+msgstr "ファイルウォッチャーを開始"
 
 msgid "Executing platform startup hook"
 msgstr "プラットフォームスタートアップフックを実行中"
@@ -4941,10 +4942,10 @@ msgid "launch JOSM (default, performed when no command is specified)"
 msgstr "JOSM を起動(コマンドが指定されなかった場合の既定)"
 
 msgid "render data and save the result to an image file"
-msgstr ""
+msgstr "データを描画して結果を画像ファイルへ保存"
 
 msgid "convert coordinates from one coordinate reference system to another"
-msgstr ""
+msgstr "ある座標系の座標を他の座標系に変換します"
 
 msgid ""
 "For details on the {0} and {1} commands, run them with the {2} option."
@@ -4981,7 +4982,7 @@ msgid "Launch in maximized mode"
 msgstr "最大モードで起動"
 
 msgid "Reset the preferences to default"
-msgstr "設定を既定に戻します。"
+msgstr "設定を既定に戻します"
 
 msgid "Changes preferences according to the XML file"
 msgstr "XMLファイルによって設定を変更"
@@ -5077,7 +5078,7 @@ msgid "Initializing"
 msgstr "初期化中"
 
 msgid "Setting defaults"
-msgstr "デフォルト値を設定中"
+msgstr "既定値を設定中"
 
 msgid "Creating main GUI"
 msgstr "メインGUIを作成中"
@@ -5463,12 +5464,14 @@ msgid ""
 "include information on how to reproduce the error and try to supply as much "
 "detail as possible."
 msgstr ""
+"もし JOSM とプラグインの最新版をお使いであれば、バグトラッカーにバグ報告してください。\n"
+"これらのエラー情報はすでに記入してあります。エラーを再現する方法や詳細情報をできるだけ書いてください。"
 
 msgid "Report Bug"
 msgstr "バグを報告する"
 
 msgid "Suppress this error for this session."
-msgstr ""
+msgstr "このセッションでエラーを無視します。"
 
 msgid "Suppress further error dialogs for this session."
 msgstr "このセッションにおいて、これ以降のエラーダイアログを抑制します。"
@@ -5477,7 +5480,7 @@ msgid "Ignore this error."
 msgstr "エラーを無視します。"
 
 msgid "Include the system status report."
-msgstr "システムステータスレポートを含めます。"
+msgstr "システムの動作ログを含める。"
 
 msgid "Include information about the data you were working on."
 msgstr "作業していたデータに関する情報を含めてください。"
@@ -5727,7 +5730,7 @@ msgid "Remove"
 msgstr "削除"
 
 msgid "Remove the selected entries from the list of merged elements."
-msgstr "結合された要素のリストから選択したエントリを削除"
+msgstr "結合された要素のリストから選択した項目を削除"
 
 msgid "Freeze"
 msgstr "固定"
@@ -5744,24 +5747,24 @@ msgstr "結合された要素のリスト固定を解除して結合をはじめ
 msgid ""
 "<html>Click <strong>{0}</strong> to start merging my and their "
 "entries.</html>"
-msgstr "<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を開始</html>"
+msgstr "<html><strong>{0}</strong> をクリックすると、自分と他の項目の結合を開始します。</html>"
 
 msgid ""
 "<html>Click <strong>{0}</strong> to finish merging my and their "
 "entries.</html>"
-msgstr "<html><strong>{0}</strong> をクリックして自分と相手のエントリの結合を完了</html>"
+msgstr "<html><strong>{0}</strong> をクリックすると、自分と他の項目の結合を完了します。</html>"
 
 msgid "My version ({0} entry)"
 msgid_plural "My version ({0} entries)"
-msgstr[0] "自分のバージョン({0}項目)"
+msgstr[0] "自分のバージョン ({0}項目)"
 
 msgid "Merged version ({0} entry)"
 msgid_plural "Merged version ({0} entries)"
-msgstr[0] "結合したバージョン({0}項目)"
+msgstr[0] "結合したバージョン ({0}項目)"
 
 msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
-msgstr[0] "相手のバージョン({0}項目)"
+msgstr[0] "他のバージョン({0}項目)"
 
 msgid "My version (local dataset)"
 msgstr "自分のバージョン(ローカルデータセット)"
@@ -7753,7 +7756,7 @@ msgid_plural "Change properties of up to {0} objects"
 msgstr[0] "{0}件のオブジェクトのプロパティ変更"
 
 msgid "Use English language for tag by default"
-msgstr "デフォルトではタグに英語を使用してください"
+msgstr "既定ではタグに英語を使用してください"
 
 msgid "Add value?"
 msgstr "値を追加しますか?"
@@ -8239,7 +8242,7 @@ msgid "Home location"
 msgstr "ホーム位置"
 
 msgid "Error reading bookmark entry: %s"
-msgstr "ブックマークエントリ %s の読み取りに失敗しました"
+msgstr "ブックマーク項目 %s の読み取りに失敗しました"
 
 msgid "Bookmarks"
 msgstr "ブックマーク"
@@ -8309,9 +8312,6 @@ msgstr "緯度の値は[-90,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>"
@@ -8400,7 +8400,7 @@ msgid "Download area too large; will probably be rejected by server"
 msgstr "ダウンロード領域が広すぎます。サーバーから拒否されるでしょう"
 
 msgid "Download area ok, size probably acceptable to server"
-msgstr "ダウンロード領域はOKです。指定のサイズはサーバーに受け入れられるでしょう"
+msgstr "ダウンロード領域はOKです。このサイズならサーバーが処理できるでしょう"
 
 msgid "Download from Overpass API"
 msgstr "Overpass API からダウンロード"
@@ -8485,7 +8485,7 @@ msgid "Download object by specifying a specific location. For example,"
 msgstr ""
 
 msgid "{0} all objects having {1} as attribute are downloaded."
-msgstr ""
+msgstr "属性に {1} を含む {0} 件すべてのオブジェクトをダウンロードしました"
 
 msgid ""
 "{0} all object with the corresponding key/value pair located around Berlin. "
@@ -8495,7 +8495,7 @@ msgstr ""
 
 msgid ""
 "{0} all objects within the current selection that have {1} as attribute."
-msgstr ""
+msgstr "選択中のうち属性に {1} を含む {0} 件すべてのオブジェクト"
 
 msgid ""
 "Instead of <i>location</i> any valid place name can be used like address, "
@@ -8645,8 +8645,8 @@ msgid ""
 "<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only "
 "possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
 msgstr ""
-"<html>現在のURLの<tt>{0}</tt><br>は外部URLです。編集は、ヘルプサーバー<tt>{1}</tt>のヘルプ項目だけ可能です。</h"
-"tml>"
+"<html><tt>{0}</tt><br> は外部 URL です。ヘルプサーバー <tt>{1}</tt> "
+"のヘルプ項目だけが編集は可能です。</html>"
 
 msgid "Reload the current help page"
 msgstr "現在のヘルプページを再ロード"
@@ -9821,6 +9821,9 @@ msgstr "ファイル''{0}''中にデータが見つかりません。"
 msgid "Open OSM file"
 msgstr "OSMファイルをオープン"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -9953,7 +9956,7 @@ msgid "IOError while creating file, autosave will be skipped: {0}"
 msgstr "ファイル作成中にIOエラーが発生、自動保存はスキップされます: {0}"
 
 msgid "Unable to delete old backup file {0}"
-msgstr "古いバックアップファイル{0}が削除できません。"
+msgstr "古いバックアップファイル {0} が削除できません"
 
 msgid "Your work has been saved automatically."
 msgstr "作業内容が自動的に保存されました。"
@@ -10985,7 +10988,7 @@ msgid "Click to reset the OAuth settings to default values"
 msgstr "OAuthの設定を初期値にリセット"
 
 msgid "Click to abort resetting to the OAuth default values"
-msgstr "OAuthの初期値へのリセットを中断"
+msgstr "クリックで OAuth の初期値へのリセットを中止"
 
 msgid ""
 "<html>JOSM is about to reset the OAuth settings to default values.<br>The "
@@ -10993,7 +10996,7 @@ msgid ""
 msgstr "<html>OAuth認証の設定が初期値に戻ります。<br>現在の設定値は保存されません。</html>"
 
 msgid "Overwrite custom OAuth settings?"
-msgstr "既にあるOAuthの設定を上書きしてよろしいですか?"
+msgstr "OAuth の設定を上書きしてよろしいですか?"
 
 msgid "Fully automatic"
 msgstr "全自動"
@@ -11020,9 +11023,9 @@ msgid ""
 "external browser<br>to authenticate itself and to accept the request token "
 "submitted by JOSM.</html>"
 msgstr ""
-"<html>半自動でOSMウェブサイトからアクセストークンを取得します。<br>JOSMは標準的なOAuthリクエストを発行して、リクエストトークンと<b"
-"r>アクセストークンを取得します。そしてJOSMを認証させJOSMが発行した<br>リクエストトークンを受け入れるために、外部ブラウザーでOSMウェブサイ"
-"ト<br>を表示します。</html>"
+"<html>半自動で OSM ウェブサイトからアクセストークンを取得します。<br>JOSM は標準的な OAuth "
+"リクエストを発行して、リクエストトークンと<br>アクセストークンを取得します。そして JOSM を認証させ JOSM "
+"が発行した<br>リクエストトークンを受け入れるために、外部ブラウザーで OSM ウェブサイト<br>を表示します。</html>"
 
 msgid ""
 "<html>Enter an Access Token manually if it was generated and retrieved "
@@ -11048,7 +11051,7 @@ msgid "Granted rights"
 msgstr "認められた権利"
 
 msgid "Advanced OAuth properties"
-msgstr "OAuthの高度な設定"
+msgstr "OAuth の高度な設定"
 
 msgid "Accept Access Token"
 msgstr "アクセストークンを受け入れる"
@@ -11058,8 +11061,9 @@ msgid ""
 "website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
 "in subsequent requests to gain access to the OSM API.</html>"
 msgstr ""
-"<html>OSMウェブサイトからのAuthアクセストークンの取得に成功しました。トークンを受け入れるには<strong>{0}</strong>をクリッ"
-"クしてください。引き続き、これを使用してJOSMがOSM APIへのアクセス権を取得します。</html>"
+"<html>OSM ウェブサイトからの Auth "
+"アクセストークンの取得に成功しました。トークンを受け入れるには<strong>{0}</strong>をクリックしてください。引き続き、これを使用して "
+"JOSMが OSM API へのアクセス権を取得します。</html>"
 
 msgid "Authorize now"
 msgstr "今すぐ認証"
@@ -11090,8 +11094,9 @@ msgid ""
 "OSM server failed.<br><br>Please try again or choose another kind of "
 "authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
 msgstr ""
-"<html>OSMサーバーからOAuthアクセストークンを取得する自動手続きが失敗しました。<br><br>やり直すか、他の認証手続き(例:半自動認証や手"
-"動認証)を選択してください。</html>"
+"<html>OSM サーバーから OAuth "
+"アクセストークンを取得する自動手続きが失敗しました。<br><br>やり直すか、他の認証手続き(例:半自動認証や手動認証)を選択してください。</html"
+">"
 
 msgid "OAuth authorization failed"
 msgstr "OAuth認証に失敗しました"
@@ -12349,22 +12354,22 @@ msgid "Imagery Background: Default"
 msgstr "画像の背景: デフォルト"
 
 msgid "Available default entries:"
-msgstr "利用可能なエントリ:"
+msgstr "利用可能な項目:"
 
 msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
-msgstr ""
+msgstr "新しい既定の項目は <a href=\"{0}\">Wiki</a> から追加できます。"
 
 msgid "Selected entries:"
-msgstr "選択済みのエントリ:"
+msgstr "選択済みの項目:"
 
 msgid "Add a new {0} entry by entering the URL"
 msgstr "URLを入力して新しい{0}を追加"
 
 msgid "Remove entry"
-msgstr "エントリを削除"
+msgstr "項目を削除"
 
 msgid "copy selected defaults"
-msgstr "選択したエントリをコピーします"
+msgstr "選択した項目をコピーします"
 
 msgid "Please select at least one row to copy."
 msgstr "コピーする行を1つ以上選んでください。"
@@ -12451,17 +12456,17 @@ msgstr ""
 "クラッシュが起こった場合、JOSMは次の起動時に未保存の変更の回復を試みます。)</i>"
 
 msgid "Keep backup files when saving data layers"
-msgstr "データレイヤー保存時にバックアップファイルを維持"
+msgstr "データレイヤー保存時にバックアップファイルを保存"
 
 msgid "When saving, keep backup files ending with a ~"
-msgstr "保存時に、バックアップファイルを、ファイル名の末尾に~をつけてとっておく。"
+msgstr "保存時にバックアップファイルをファイル名の末尾に ~ を付加して保存しておく"
 
 msgid ""
 "<i>(JOSM can keep a backup file when saving data layers. It appends ''~'' to "
 "the file name and saves it in the same folder.)</i>"
 msgstr ""
-"<i>(JOSMはデータレイヤーを保存する際にバックアップファイルを保持できます。 "
-"ファイル名の最後に''~''を付加して同じフォルダに保存します。)</i>"
+"<i>(JOSM はデータレイヤーを保存する際にバックアップファイルを保存できます。 ファイル名の末尾に ''~'' "
+"を付加して同じフォルダに保存します。)</i>"
 
 msgid "Notification at each save"
 msgstr "保存するごとに通知"
@@ -12473,7 +12478,7 @@ msgid "File backup"
 msgstr "ファイルバックアップ"
 
 msgid "Configure whether to create backup files"
-msgstr "バックアップファイルを作成するかどうか構成を決める"
+msgstr "バックアップファイルを作成するかどうか設定する"
 
 msgid "Enable built-in icon defaults"
 msgstr "ビルトインアイコンのデフォルトを有効化"
@@ -12517,7 +12522,7 @@ msgid "Map Settings"
 msgstr "マップ設定"
 
 msgid "Settings for the map projection and data interpretation."
-msgstr "地図投影法とデータ解釈の設定です。"
+msgstr "地図投影法とデータ解析の設定です。"
 
 msgid "Could not read tagging preset source: {0}"
 msgstr "タグ付けプリセットのソース {0} を読み込めません。"
@@ -12623,7 +12628,7 @@ msgid " (requires: {0})"
 msgstr " ({0}が必要)"
 
 msgid "Configure available plugins."
-msgstr "利用可能なプラグインを設定"
+msgstr "利用可能なプラグインの設定です。"
 
 msgid ""
 "The following plugin has been downloaded <strong>successfully</strong>:"
@@ -12664,7 +12669,7 @@ msgid "Download list"
 msgstr "リストのダウンロード"
 
 msgid "Download the list of available plugins"
-msgstr "利用可能なプラグインのリストをダウンロード"
+msgstr "利用可能なプラグインの一覧をダウンロード"
 
 msgid "Update the selected plugins"
 msgstr "選択したプラグインを更新"
@@ -12684,23 +12689,23 @@ msgid "Configure the list of sites where plugins are downloaded from"
 msgstr "プラグインダウンロード元のサイトのリストを構成"
 
 msgid "Load from list..."
-msgstr ""
+msgstr "一覧からロード..."
 
 msgid "Load plugins from a list of plugins"
 msgstr ""
 
 msgid "Disable all other plugins"
-msgstr ""
+msgstr "それ以外のプラグインをすべて無効にする"
 
 msgid "Enter a list of plugins you want to download."
-msgstr ""
+msgstr "ダウンロードしたいプラグインの一覧を入力してください。"
 
 msgid ""
 "You should add one plugin id per line, version information is ignored."
-msgstr ""
+msgstr "プラグインIDを1行に1つずつ記入してください。バージョン情報は無視されます。"
 
 msgid "You can copy+paste the list of a status report here."
-msgstr ""
+msgstr "ここに動作ログの一覧をコピー&ペーストできます。"
 
 msgid "Load plugins from list"
 msgstr "一覧からプラグインをロード"
@@ -12738,7 +12743,7 @@ msgstr "更新しない"
 msgid ""
 "Please decide whether JOSM shall automatically update active plugins at "
 "startup after an update of JOSM itself."
-msgstr "JOSMがJOSM自身を更新した後、再起動時にアクティブなプラグインを自動更新するかどうかを決めてください。"
+msgstr "JOSM 自身の更新後の再起動で、有効なプラグインを自動更新するかどうかを選択して下さい。"
 
 msgid ""
 "Please decide whether JOSM shall automatically update active plugins after a "
@@ -12860,7 +12865,7 @@ msgid "Projection method"
 msgstr "投影法"
 
 msgid "Set as default"
-msgstr ""
+msgstr "既定値に設定"
 
 msgid "Default projection"
 msgstr "既定の投影法"
@@ -12937,9 +12942,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 "すべてのリモート制御の指示を手動で確認"
 
@@ -14663,6 +14665,10 @@ msgstr "プラグインを継続"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "クリックしてプラグイン ''{0}'' を保持"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr "一時的なダウンロードファイル''{1}''から''{0}''プラグインのインストールに失敗しました。{2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "期限切れのプラグイン''{0}''の削除に失敗しました。"
 
@@ -14673,10 +14679,6 @@ msgstr ""
 "ダウンロード済みのプラグイン''{0}''のインストールに失敗しました。インストールをスキップします。JOSMは古いバージョンをダウンロードします。"
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr "一時的なダウンロードファイル''{1}''から''{0}''プラグインのインストールに失敗しました。{2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr "一時的なダウンロードファイル''{1}''から''{0}''プラグインのインストールに失敗しました。ファイル名の変更に失敗しました。"
@@ -15382,7 +15384,7 @@ msgstr "通り名住居表示"
 
 msgctxt "Relation type"
 msgid "boundary"
-msgstr "行政境界"
+msgstr "境界線"
 
 msgctxt "Relation type"
 msgid "bridge"
@@ -16551,10 +16553,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "屋上"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "小型"
-
 msgid "Start date"
 msgstr "運用開始日"
 
@@ -16778,7 +16776,7 @@ msgid "Destination"
 msgstr "目的地"
 
 msgid "Destination reference"
-msgstr ""
+msgstr "目的地"
 
 msgid "Placement"
 msgstr "配置"
@@ -17137,13 +17135,13 @@ msgid "grade2"
 msgstr "グレード2"
 
 msgid "Mostly Solid: gravel/rock with some soft material mixed in"
-msgstr ""
+msgstr "やや硬い : 砂利や石に柔らかい土などが混ざっている"
 
 msgid "grade3"
 msgstr "グレード3"
 
 msgid "Even mixture of hard and soft materials"
-msgstr ""
+msgstr "硬い物とやわらかい物が均等に混ざっている"
 
 msgid "grade4"
 msgstr "グレード4"
@@ -17500,7 +17498,7 @@ msgid "Island"
 msgstr "島"
 
 msgid "Rumble strip"
-msgstr ""
+msgstr "ランブルトリップス"
 
 msgid "Table"
 msgstr "スピードテーブル"
@@ -17557,7 +17555,7 @@ msgid "Elevation"
 msgstr "高度"
 
 msgid "Barriers"
-msgstr "柵"
+msgstr "障害物"
 
 msgid "Block"
 msgstr "ブロック"
@@ -17625,7 +17623,7 @@ msgid "Wall"
 msgstr "壁"
 
 msgid "dry_stone"
-msgstr ""
+msgstr "石積み"
 
 msgid "noise_barrier"
 msgstr "防音壁"
@@ -17637,7 +17635,7 @@ msgid "Retaining Wall"
 msgstr "擁壁"
 
 msgid "Jersey Barrier"
-msgstr ""
+msgstr "ジャージーバリア"
 
 msgctxt "Barrier"
 msgid "Ditch"
@@ -17647,10 +17645,10 @@ msgid "Kerb"
 msgstr "縁石"
 
 msgid "Tactile paving"
-msgstr ""
+msgstr "点字ブロック"
 
 msgid "Entrance (Barrier Opening)"
-msgstr "出入口(柵の開口部)"
+msgstr "出入口 (障害物の開口部)"
 
 msgid "Gate"
 msgstr "門"
@@ -17670,7 +17668,7 @@ msgid "double"
 msgstr "両側"
 
 msgid "Hampshire Gate"
-msgstr "ワイヤゲート"
+msgstr "ワイヤーゲート"
 
 msgid "Bump Gate"
 msgstr "バンプ・ゲート"
@@ -17776,13 +17774,13 @@ msgid "Basin"
 msgstr "遊水地"
 
 msgid "retention"
-msgstr ""
+msgstr "調整池"
 
 msgid "infiltration"
-msgstr ""
+msgstr "浸透型雨水調整池"
 
 msgid "detention"
-msgstr ""
+msgstr "貯留型雨水調整池"
 
 msgid "Reservoir"
 msgstr "貯水池"
@@ -17794,7 +17792,7 @@ msgid "tailings"
 msgstr ""
 
 msgid "water_storage"
-msgstr ""
+msgstr "貯水池"
 
 msgid "Covered Reservoir"
 msgstr "蓋付き貯水池"
@@ -17831,10 +17829,10 @@ msgid "river"
 msgstr "河川"
 
 msgid "lock"
-msgstr ""
+msgstr "閘門"
 
 msgid "wastewater"
-msgstr ""
+msgstr "下水"
 
 msgid "Salt Water"
 msgstr "塩水"
@@ -18042,6 +18040,9 @@ msgstr "バイオディーゼル"
 msgid "Octane 80"
 msgstr "オクタン価80"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "オクタン価91[レギュラー]"
 
@@ -18063,6 +18064,9 @@ msgstr "E10 (10%エタノール混合)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85(85%エタノール混合)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPガス"
 
@@ -20716,6 +20720,12 @@ msgstr "噴水"
 msgid "Water Well"
 msgstr "井戸"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "灯台"
 
@@ -23498,7 +23508,7 @@ msgid "where enforcement ends"
 msgstr "取締り終了位置"
 
 msgid "traffic light or barrier that stops you"
-msgstr "停止信号または柵"
+msgstr "停止させるための信号または障害物"
 
 msgid "Routes"
 msgstr "ルート"
@@ -23788,6 +23798,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"
 
@@ -23869,7 +23906,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 ""
@@ -23884,7 +23921,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 ""
@@ -23892,21 +23929,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 ""
 
@@ -24045,13 +24104,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"
@@ -24084,14 +24143,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 ""
@@ -24157,7 +24216,7 @@ 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"
+msgid "imagico.de: Rila and Pirin Mountains"
 msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
@@ -24244,13 +24303,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)"
@@ -24418,34 +24477,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 ""
@@ -24453,7 +24511,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)"
@@ -24501,7 +24559,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24509,7 +24567,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 ""
@@ -24680,8 +24738,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 ""
@@ -24689,9 +24746,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 ""
@@ -24699,10 +24754,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"
@@ -24735,57 +24790,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 ""
@@ -24793,13 +24843,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 ""
@@ -24867,13 +24917,13 @@ msgstr "OpenStreetMap Hungary (hiking routes)"
 msgid "Hillshade Hungary"
 msgstr "Hillshade Hungary"
 
-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 ""
@@ -24881,7 +24931,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24889,7 +24939,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24897,19 +24947,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 ""
@@ -25014,13 +25064,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 ""
@@ -25028,7 +25078,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)"
@@ -25122,13 +25172,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 ""
 
@@ -25216,6 +25259,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 ""
 
@@ -25224,6 +25281,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 ""
 
@@ -25231,13 +25312,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 ""
@@ -25251,7 +25332,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 ""
@@ -25259,29 +25340,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)"
@@ -25350,7 +25430,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"
@@ -25383,6 +25466,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 ""
 
@@ -25431,33 +25520,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 ""
@@ -25465,7 +25552,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)"
@@ -25511,25 +25598,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"
@@ -25553,7 +25640,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)"
@@ -25649,7 +25736,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 ""
@@ -25657,6 +25744,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"
 
@@ -25675,7 +25769,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)"
@@ -25737,7 +25831,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 ""
@@ -25745,13 +25839,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)"
@@ -25838,7 +25932,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 ""
@@ -25846,7 +25947,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"
@@ -25861,6 +25962,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"
 
@@ -26856,43 +26963,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"
-msgstr "{0}: デフォルトはメートル; 区切り文字はピリオド; 単位は空白を置いて表記"
+"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"
-msgstr "異常な{0}の書式"
+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 "電圧はボルトで単位・区切り文字・空白を入れないでください"
 
-msgid "unusual {0} specification"
-msgstr "異常な{0}の定義"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "軌間の書式が普通ではない(区切り文字なしでmmで指定)"
-
-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 ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -26999,6 +27099,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 "通りのラベルを表示(大きいズームの時)"
 
@@ -27019,7 +27122,7 @@ msgstr "単一のダイアログでグループの共通の住所を補完入力
 msgid ""
 "Makes a pair of selected way segments parallel by rotating one of them "
 "around a chosen pivot."
-msgstr "選択されたウェイ区間の組を、そのひとつを選ばれたピボットのまわりで回転させることで平行にします。"
+msgstr "選択されたウェイ区間の組について、一方を選択した支点で回転させることによって平行にします。"
 
 msgid ""
 "Provides Apache Commons library components. Not meant to be installed "
@@ -27046,6 +27149,11 @@ msgid ""
 "Automatically assigns the address to a selected object in Austria. Data © "
 "Österreichisches Adressregister 2017, N 23806/2017."
 msgstr ""
+"オーストリアの選択されたオブジェクトに自動的に住所を割り当てます。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 "
@@ -27084,6 +27192,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr "コマンドラインを実装しており、自分のコマンドを作成することができます。標準コマンド(arc, circle,他)はリンクを参照。"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -27135,6 +27246,11 @@ msgstr "高度プロファイルやGPXトラックの統計データをいくつ
 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中での外部スクリプトの使用"
 
@@ -27316,6 +27432,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr "現在の表示スクリーンエリアに交差するgpx/osm ファイルのオープンを許可"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr "現在表示されているスクリーンを、きれいなSVG画像として表示されるように、Firefoxを起動する。"
@@ -28127,550 +28246,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 ""
-
-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 "''{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 ""
-
-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 "NanoLog"
 
@@ -29446,6 +29021,105 @@ 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 "このツールは1つのノードをウェイやマルチポリゴンにアップグレードしたり、ウェイをウェイで置き換えたりすることができます。"
+
+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 "データベース内にある1本のウェイと、位置を修正したい新しいウェイを選択してください。"
+
+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 ""
 
@@ -29479,9 +29153,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 "建物のサイズを設定"
 
@@ -29494,8 +29189,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 "長さの単位:"
@@ -30211,6 +29915,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 "合成"
 
@@ -30707,6 +30423,9 @@ msgstr "GeoChatパネルを開く"
 msgid "Zoom in to see messages"
 msgstr "メッセージを見るためにズームイン"
 
+msgid "Login"
+msgstr "ログイン"
+
 msgid "Enable autologin"
 msgstr "自動ログインを有効化"
 
@@ -30738,24 +30457,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 "位置のみ"
 
@@ -30846,6 +30556,9 @@ msgstr "Globalsatのインポート"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "グローバルサット・データロガー DG100からGPXレイヤーにデータをインポート"
 
+msgid "Import"
+msgstr "インポート"
+
 msgid "GPS Blams"
 msgstr "GPSバン"
 
@@ -31557,7 +31270,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"
@@ -31590,31 +31321,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"
@@ -32466,8 +32258,8 @@ msgid ""
 "Unable to detect Coordinate Reference System.\n"
 "Would you like to fallback to ESPG:4326 (WGS 84) ?"
 msgstr ""
-"座標参照系が検出できませんでした。\n"
-"ESPG:4326(WGS 84)に切り替えますか?"
+"座標系が検出できませんでした。\n"
+"既定の ESPG:4326 (WGS 84) に切り替えますか?"
 
 msgid "Warning: CRS not found"
 msgstr "警告: 座標参照系が見つかりません"
@@ -32711,6 +32503,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"
 
@@ -32955,7 +32768,7 @@ msgid "settings"
 msgstr "設定"
 
 msgid "keep backup files"
-msgstr "バックアップファイルを保持"
+msgstr "バックアップファイルを保存"
 
 msgid "change file modification time:"
 msgstr "ファイル更新時刻を変更:"
@@ -32998,13 +32811,13 @@ msgid "Could not rename file {0} to {1}!"
 msgstr "ファイル名を{0}から{1}に変更できませんでした。"
 
 msgid "<html><h3>There are old backup files in the image directory!</h3>"
-msgstr "<html><h3>画像ディレクトリに古いバックアップファイルがあります</h3>"
+msgstr "<html><h3>画像ディレクトリに古いバックアップファイルがあります。</h3>"
 
 msgid "Override old backup files?"
 msgstr "古いバックアップファイルを上書きしますか?"
 
 msgid "Keep old backups and continue"
-msgstr "古いバックアップファイルを保持して継続"
+msgstr "古いバックアップファイルを保存して継続"
 
 msgid "Override"
 msgstr "上書き"
@@ -33044,6 +32857,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr "先に画像を選択して下さい。"
 
+msgid "No image selected"
+msgstr "画像が選択されていません"
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33785,6 +33601,9 @@ msgstr "暗黙"
 msgid "State"
 msgstr "州(state)"
 
+msgid "pending"
+msgstr "保留"
+
 msgid "[incomplete]"
 msgstr "[不完全]"
 
@@ -34197,12 +34016,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>"
@@ -34547,12 +34360,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 "強調"
 
@@ -36165,40 +35972,6 @@ msgid ""
 "exactly two objects to be selected."
 msgstr "このツールは1つのオブジェクトと他のオブジェクトの配置を置き換えますので、正確に2つのオブジェクトを選択する必要があります。"
 
-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 "このツールは1つのノードをウェイやマルチポリゴンにアップグレードしたり、ウェイをウェイで置き換えたりすることができます。"
-
-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 "データベース内にある1本のウェイと、位置を修正したい新しいウェイを選択してください。"
-
-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 ""
 
@@ -36272,9 +36045,6 @@ msgstr "途中のノードを選択します"
 msgid "Please select two nodes connected by way!"
 msgstr "ウェイで接続された2つのノードを選択しください。"
 
-msgid "Too many ways are added: {0}!"
-msgstr "追加するウェイの数({0}本)が多すぎます。"
-
 msgid "All inside [testing]"
 msgstr "中身すべて [テスト中]"
 
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index 1bcd569..c02cc47 100644
--- a/i18n/po/ka.po
+++ b/i18n/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2011-12-16 00:14+0000\n"
 "Last-Translator: datogogishvili <Unknown>\n"
 "Language-Team: Georgian <ka at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:43+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:43+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: ka\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -952,8 +952,8 @@ msgstr ""
 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 "მონიშნე მონაცემები, რომელიც უნდა იქნას გადმოქაჩული ახალ ფენაში."
@@ -2250,12 +2250,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"
@@ -8251,9 +8251,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>"
@@ -9706,6 +9703,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12748,9 +12748,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 ""
 
@@ -14443,6 +14440,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 ""
 
@@ -14452,10 +14453,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 ""
@@ -16279,10 +16276,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17768,6 +17761,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17789,6 +17785,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20442,6 +20441,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23513,6 +23518,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 ""
 
@@ -23594,7 +23626,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23609,7 +23641,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 ""
@@ -23617,21 +23649,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 ""
 
@@ -23770,13 +23824,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"
@@ -23809,14 +23863,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 ""
@@ -23882,7 +23936,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)"
@@ -23969,13 +24023,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)"
@@ -24143,34 +24197,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 ""
@@ -24178,7 +24231,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)"
@@ -24226,7 +24279,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24234,7 +24287,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 ""
@@ -24403,8 +24456,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 ""
@@ -24412,9 +24464,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 ""
@@ -24422,10 +24472,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"
@@ -24458,57 +24508,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 ""
@@ -24516,13 +24561,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 ""
@@ -24590,13 +24635,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 ""
@@ -24604,7 +24649,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24612,7 +24657,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24620,19 +24665,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 ""
@@ -24737,13 +24782,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 ""
@@ -24751,7 +24796,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)"
@@ -24845,13 +24890,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 ""
 
@@ -24939,6 +24977,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 ""
 
@@ -24947,6 +24999,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 ""
 
@@ -24954,13 +25030,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 ""
@@ -24974,7 +25050,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 ""
@@ -24982,29 +25058,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)"
@@ -25073,7 +25148,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"
@@ -25106,6 +25184,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 ""
 
@@ -25154,33 +25238,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 ""
@@ -25188,7 +25270,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)"
@@ -25234,25 +25316,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"
@@ -25276,7 +25358,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)"
@@ -25372,7 +25454,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 ""
@@ -25380,6 +25462,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 ""
 
@@ -25398,7 +25487,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)"
@@ -25460,7 +25549,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 ""
@@ -25468,13 +25557,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)"
@@ -25561,7 +25650,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 ""
@@ -25569,7 +25665,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"
@@ -25584,6 +25680,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26575,32 +26677,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"
@@ -26609,9 +26707,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 ""
 
@@ -26718,6 +26813,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 ""
 
@@ -26761,6 +26859,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."
@@ -26794,6 +26895,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26841,6 +26945,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 ""
 
@@ -27006,6 +27115,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 ""
@@ -27795,550 +27907,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 ""
 
@@ -29033,6 +28601,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 ""
 
@@ -29066,9 +28732,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 ""
 
@@ -29081,7 +28768,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:"
@@ -29760,6 +29456,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 ""
 
@@ -30254,6 +29962,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30286,22 +29997,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"
@@ -30391,6 +30093,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31080,7 +30785,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"
@@ -31113,31 +30836,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"
@@ -32218,6 +32002,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 ""
 
@@ -32551,6 +32356,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33288,6 +33096,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33698,12 +33509,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>"
@@ -34040,12 +33845,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35586,39 +35385,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 ""
 
@@ -35692,9 +35458,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/km.po b/i18n/po/km.po
index 2f470e4..f52d27e 100644
--- a/i18n/po/km.po
+++ b/i18n/po/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2015-01-27 10:25+0000\n"
 "Last-Translator: Sophea Sok <sksophea at gmail.com>\n"
 "Language-Team: Khmer <km at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:50+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:50+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1002,8 +1002,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 "ជ្រើស បើ​ទិន្នន័យ​គួរ​ត្រូវ​បាន​ទាញ​យក​នៅ​ក្នុង​ស្រទាប់​ថ្មី"
@@ -2390,12 +2390,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"
@@ -8755,9 +8755,6 @@ msgstr "បាន​ទាមទារ​តម្លៃ​សម្រាប់
 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>"
@@ -10387,6 +10384,9 @@ msgstr "រក​មិន​ឃើញ​ទិន្នន័យ​នៅ​ក
 msgid "Open OSM file"
 msgstr "បើក​ឯកសារ OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -13696,9 +13696,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 "បញ្ជាក់​សកម្មភាព​ការ​បញ្ជា​ពី​ចម្ងាយ​ដោយ​ដៃ"
 
@@ -15620,6 +15617,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}'' ។"
 
@@ -15631,12 +15634,6 @@ msgstr ""
 "រំលង​ការ​ដំឡើង។ JOSM នឹង​នៅតែ​ផ្ទុក​កំណែ​កម្មវិធី​ជំនួយ​ចាស់។"
 
 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 ""
@@ -17599,10 +17596,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -19088,6 +19081,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -19109,6 +19105,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -21762,6 +21761,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -24833,6 +24838,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 ""
 
@@ -24914,7 +24946,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -24929,7 +24961,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 ""
@@ -24937,21 +24969,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 ""
 
@@ -25090,13 +25144,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"
@@ -25129,14 +25183,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 ""
@@ -25202,7 +25256,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)"
@@ -25289,13 +25343,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)"
@@ -25463,34 +25517,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 ""
@@ -25498,7 +25551,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)"
@@ -25546,7 +25599,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -25554,7 +25607,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 ""
@@ -25723,8 +25776,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 ""
@@ -25732,9 +25784,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 ""
@@ -25742,10 +25792,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"
@@ -25778,57 +25828,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 ""
@@ -25836,13 +25881,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 ""
@@ -25910,13 +25955,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 ""
@@ -25924,7 +25969,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -25932,7 +25977,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -25940,19 +25985,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 ""
@@ -26057,13 +26102,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 ""
@@ -26071,7 +26116,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)"
@@ -26165,13 +26210,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 ""
 
@@ -26259,6 +26297,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 ""
 
@@ -26267,6 +26319,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 ""
 
@@ -26274,13 +26350,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 ""
@@ -26294,7 +26370,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 ""
@@ -26302,29 +26378,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)"
@@ -26393,7 +26468,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"
@@ -26426,6 +26504,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 ""
 
@@ -26474,33 +26558,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 ""
@@ -26508,7 +26590,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)"
@@ -26554,25 +26636,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"
@@ -26596,7 +26678,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)"
@@ -26692,7 +26774,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 ""
@@ -26700,6 +26782,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 ""
 
@@ -26718,7 +26807,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)"
@@ -26780,7 +26869,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 ""
@@ -26788,13 +26877,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)"
@@ -26881,7 +26970,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 ""
@@ -26889,7 +26985,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"
@@ -26904,6 +27000,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -27895,32 +27997,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"
+"unusual value of {0}: tonne 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 ""
-
-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"
@@ -27929,9 +28027,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 ""
 
@@ -28038,6 +28133,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 ""
 
@@ -28089,6 +28187,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."
@@ -28136,6 +28237,9 @@ msgstr ""
 "អនុវត្ត​បន្ទាត់​ពាក្យ​បញ្ជា រួច​បើក​វា​ដើម្បី​បង្កើត​ពាក្យ​បញ្ជា​របស់​អ្នក។ "
 "មើល​តំណ​សម្រាប់​ពាក្យ​បញ្ជា​ស្តង់ដារ (អ័ក្ស រង្វង់។ល។)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -28190,6 +28294,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Handling of French EPCIs (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "ប្រើ​ស្គ្រីប​ខាងក្រៅ​នៅ​ក្នុង JOSM"
 
@@ -28399,6 +28508,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 ""
@@ -29201,550 +29313,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 ""
 
@@ -30439,6 +30007,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 ""
 
@@ -30472,9 +30138,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 ""
 
@@ -30487,7 +30174,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:"
@@ -31166,6 +30862,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 ""
 
@@ -31660,6 +31368,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -31692,22 +31403,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"
@@ -31797,6 +31499,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -32486,7 +32191,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"
@@ -32519,31 +32242,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"
@@ -33624,6 +33408,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 ""
 
@@ -33957,6 +33762,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -34694,6 +34502,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -35104,12 +34915,6 @@ msgstr ""
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-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>"
@@ -35446,12 +35251,6 @@ msgstr ""
 msgid "Presets"
 msgstr "ការ​កំណត់​ជាមុន"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -36992,39 +36791,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 ""
 
@@ -37098,9 +36864,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/ko.po b/i18n/po/ko.po
index 573d939..9461779 100644
--- a/i18n/po/ko.po
+++ b/i18n/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2017-12-06 10:52+0000\n"
 "Last-Translator: Myeongjin <aranet100 at gmail.com>\n"
 "Language-Team: Korean <ko at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:51+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:51+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: ko\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -945,8 +945,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 "데이터가 새로운 레이어에 다운로드 되어야 하는지 선택합니다."
@@ -2241,12 +2241,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"
@@ -8240,9 +8240,6 @@ msgstr "[-90,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>"
@@ -9706,6 +9703,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12760,9 +12760,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 ""
 
@@ -14461,6 +14458,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 ""
 
@@ -14470,10 +14471,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 ""
@@ -16299,10 +16296,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17788,6 +17781,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17809,6 +17805,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20462,6 +20461,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23533,6 +23538,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 ""
 
@@ -23614,7 +23646,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23629,7 +23661,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 ""
@@ -23637,21 +23669,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 ""
 
@@ -23790,13 +23844,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"
@@ -23829,14 +23883,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 ""
@@ -23902,7 +23956,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)"
@@ -23989,13 +24043,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)"
@@ -24163,34 +24217,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 ""
@@ -24198,7 +24251,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)"
@@ -24246,7 +24299,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24254,7 +24307,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 ""
@@ -24423,8 +24476,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 ""
@@ -24432,9 +24484,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 ""
@@ -24442,10 +24492,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"
@@ -24478,57 +24528,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 ""
@@ -24536,13 +24581,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 ""
@@ -24610,13 +24655,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 ""
@@ -24624,7 +24669,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24632,7 +24677,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24640,19 +24685,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 ""
@@ -24757,13 +24802,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 ""
@@ -24771,7 +24816,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)"
@@ -24865,13 +24910,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 ""
 
@@ -24959,6 +24997,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 ""
 
@@ -24967,6 +25019,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 ""
 
@@ -24974,13 +25050,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 ""
@@ -24994,7 +25070,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 ""
@@ -25002,29 +25078,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)"
@@ -25093,7 +25168,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"
@@ -25126,6 +25204,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 ""
 
@@ -25174,33 +25258,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 ""
@@ -25208,7 +25290,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)"
@@ -25254,25 +25336,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"
@@ -25296,7 +25378,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)"
@@ -25392,7 +25474,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 ""
@@ -25400,6 +25482,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 ""
 
@@ -25418,7 +25507,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)"
@@ -25480,7 +25569,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 ""
@@ -25488,13 +25577,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)"
@@ -25581,7 +25670,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 ""
@@ -25589,7 +25685,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"
@@ -25604,6 +25700,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26595,32 +26697,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"
@@ -26629,9 +26727,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 ""
 
@@ -26738,6 +26833,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 "(높은 수준의 확대에서) 거리 레이블 표시"
 
@@ -26781,6 +26879,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."
@@ -26814,6 +26915,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26861,6 +26965,11 @@ msgstr "GPX 트랙의 고도 프로필과 일부 통계 자료를 보여줍니
 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 ""
 
@@ -27030,6 +27139,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 ""
@@ -27819,550 +27931,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 ""
 
@@ -29057,6 +28625,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 ""
 
@@ -29090,9 +28756,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 ""
 
@@ -29105,7 +28792,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:"
@@ -29784,6 +29480,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 ""
 
@@ -30278,6 +29986,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30310,22 +30021,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"
@@ -30415,6 +30117,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31104,7 +30809,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"
@@ -31137,31 +30860,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"
@@ -32242,6 +32026,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 ""
 
@@ -32575,6 +32380,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33312,6 +33120,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33722,12 +33533,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>"
@@ -34064,12 +33869,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr "태그 편집을 중단하고 대화 상자를 닫습니다"
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35609,39 +35408,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 ""
 
@@ -35715,9 +35481,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/ku.po b/i18n/po/ku.po
index 2319263..6382b29 100644
--- a/i18n/po/ku.po
+++ b/i18n/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2017-01-31 19:32+0000\n"
 "Last-Translator: Rokar ✌ <Unknown>\n"
 "Language-Team: Kurdish <ku at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:51+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:51+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/ky.po b/i18n/po/ky.po
index ce4cda3..06ee04f 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2012-12-18 02:36+0000\n"
 "Last-Translator: SimpleLeon <Unknown>\n"
 "Language-Team: Kirghiz <ky at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:50+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:50+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/lb.po b/i18n/po/lb.po
index c5071c0..974ec4c 100644
--- a/i18n/po/lb.po
+++ b/i18n/po/lb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2016-04-28 18:56+0000\n"
 "Last-Translator: Charel <ceilenbecker at gmail.com>\n"
 "Language-Team: Luxembourgish <lb at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:53+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:53+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr "{0}:D''Optioun \"{1}\" ass net eendeiteg"
@@ -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/lo.po b/i18n/po/lo.po
index db4ffbb..25aba15 100644
--- a/i18n/po/lo.po
+++ b/i18n/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2009-09-15 10:06+0000\n"
 "Last-Translator: Anousone <Unknown>\n"
 "Language-Team: Lao <lo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:52+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:52+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: \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/lt.po b/i18n/po/lt.po
index 4469771..62eab04 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-02 20:24+0000\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-21 18:37+0000\n"
 "Last-Translator: Aurimas Fišeras <Unknown>\n"
 "Language-Team: Lithuanian <lt at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:53+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:53+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: lt\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1028,8 +1028,8 @@ msgstr "Įveskite URL parsiuntimui:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Įveskite URL, iš kur turi būti atsiųsti duomenys"
 
-msgid "Separate Layer"
-msgstr "Atskirti sluoksnius"
+msgid "Download as new layer"
+msgstr "Atsiųsti kaip naują sluoksnį"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Pasirinkite, ar duomenys turi būti parsiųsti į naują sluoksnį"
@@ -2463,12 +2463,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"
@@ -8934,9 +8934,6 @@ msgstr "Reikia platumos reikšmės intervale [-90,90]."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Reikia ilgumos reikšmės intervale [-180,180]"
 
-msgid "Download as new layer"
-msgstr "Atsiųsti kaip naują sluoksnį"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10615,6 +10612,9 @@ msgstr "Nerasta duomenų faile ''{0}''."
 msgid "Open OSM file"
 msgstr "Atverti OSM failą"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr "Tikrinimo klaidų failai"
 
@@ -13954,9 +13954,6 @@ msgstr "Nuotolinis valdymas"
 msgid "Settings for the remote control feature."
 msgstr "Nuotolinio valdymo nustatymai."
 
-msgid "Download objects to new layer"
-msgstr "Atsiųsti objektus į naują sluoksnį"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Patvirtinti visus nuotolinio valdymo veiksmus rankiniu būdu"
 
@@ -15855,6 +15852,11 @@ msgstr "Palikti papildinį"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Spauskite papildiniui „{0}“ palikti"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Nepavyko įdiegti papildinio „{0}“ iš laikino atsiuntimo failo „{1}“. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Nepavyko pašalinti pasenusio papildinio „{0}“."
 
@@ -15866,11 +15868,6 @@ msgstr ""
 "JOSM įkels seną papildinio versiją."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Nepavyko įdiegti papildinio „{0}“ iš laikino atsiuntimo failo „{1}“. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -17895,10 +17892,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "ant_stogo"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "kioskas"
-
 msgid "Start date"
 msgstr "Pradžios data"
 
@@ -19384,6 +19377,9 @@ msgstr "Biodyzelis"
 msgid "Octane 80"
 msgstr "80 oktanas"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "91 oktanas"
 
@@ -19405,6 +19401,9 @@ msgstr "E10 (10 % etanolio mišinys)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85 % etanolio mišinys)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (suskystintos naftos dujos)"
 
@@ -22015,7 +22014,7 @@ msgid "Visible Headframe"
 msgstr ""
 
 msgid "Disused"
-msgstr ""
+msgstr "Nenaudojama"
 
 msgid "Adit"
 msgstr ""
@@ -22058,6 +22057,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Švyturys"
 
@@ -25141,6 +25146,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 ""
 
@@ -25222,7 +25254,7 @@ msgstr "OSM tikrintuvė: adresai"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -25237,7 +25269,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 ""
@@ -25245,21 +25277,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 ""
 
@@ -25398,13 +25452,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"
@@ -25437,14 +25491,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 ""
@@ -25510,7 +25564,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)"
@@ -25597,13 +25651,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)"
@@ -25771,34 +25825,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna kelių perdanga"
 
-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 ""
@@ -25806,7 +25859,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)"
@@ -25854,7 +25907,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -25862,7 +25915,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 ""
@@ -26035,8 +26088,7 @@ msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr "Rūro metropolis: Luftbilder (10 cm)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -26044,9 +26096,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 ""
@@ -26054,10 +26104,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"
@@ -26090,57 +26140,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 ""
@@ -26148,13 +26193,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 ""
@@ -26222,13 +26267,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 ""
@@ -26236,7 +26281,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -26244,7 +26289,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -26252,19 +26297,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 ""
@@ -26369,13 +26414,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 ""
@@ -26383,7 +26428,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)"
@@ -26477,13 +26522,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 ""
 
@@ -26571,6 +26609,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 ""
 
@@ -26579,6 +26631,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 ""
 
@@ -26586,13 +26662,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 ""
@@ -26606,7 +26682,7 @@ msgstr "Gazos ruožas - Pléiades - 2014/07/06"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Gazos ruožas - Pléiades - 2014/07/06 (NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -26614,29 +26690,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)"
@@ -26705,7 +26780,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"
@@ -26738,6 +26816,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 ""
 
@@ -26786,33 +26870,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 ""
@@ -26820,7 +26902,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)"
@@ -26866,25 +26948,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "Pietų Afrika CD:NGI oro nuotraukos"
 
-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"
@@ -26908,7 +26990,7 @@ msgstr "IDEIB - Balearų salos"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Kanarų salos"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -27004,7 +27086,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 ""
@@ -27012,6 +27094,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 ""
 
@@ -27030,7 +27119,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)"
@@ -27092,7 +27181,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "JAV miškų aptarnaujamieji keliai"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -27100,13 +27189,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)"
@@ -27193,7 +27282,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 ""
@@ -27201,7 +27297,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"
@@ -27216,6 +27312,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr "Septintos serijos (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr "OS Naujas Populiarus Leidinys - istorinis"
 
@@ -28065,10 +28167,10 @@ msgid "wrong value: {0}"
 msgstr ""
 
 msgid "{0} on a node. Should be used on a way."
-msgstr ""
+msgstr "{0} ant taško. Turėtų būti naudojama ant kelio."
 
 msgid "{0} on a node. Should be used on a way or relation."
-msgstr ""
+msgstr "{0} ant taško. Turėtų būti naudojama ant kelio ar ryšyje."
 
 msgid "{0} on a node. Should be drawn as an area."
 msgstr ""
@@ -28077,13 +28179,13 @@ msgid "{0} on a node. Should be used in a relation"
 msgstr ""
 
 msgid "{0} on a way. Should be used on a node."
-msgstr ""
+msgstr "{0} ant kelio. Turėtų būti naudojama ant taško."
 
 msgid "{0} on a way. Should be used in a relation"
-msgstr ""
+msgstr "{0} ant kelio. Turėtų būti naudojama ryšyje."
 
 msgid "node connects highway and building"
-msgstr ""
+msgstr "taškas jungia kelią ir pastatą"
 
 msgid ""
 "Object at Position 0.00E 0.00N. There is nothing at this position except an "
@@ -28121,10 +28223,10 @@ msgid "node connects waterway and bridge"
 msgstr "taškas jungia vandens kelią ir tiltą"
 
 msgid "{0} node connected to a highway"
-msgstr ""
+msgstr "{0} taškas prijungtas prie kelio"
 
 msgid "suspicious roundabout direction"
-msgstr ""
+msgstr "įtartina žiedo kryptis"
 
 msgid "{0} on a large area"
 msgstr ""
@@ -28172,7 +28274,7 @@ msgid "wrong highway tag on a node"
 msgstr "neteisinga kelio žyma ant taško"
 
 msgid "wrong crossing tag on a way"
-msgstr ""
+msgstr "neteisinga perėjos žyma ant kelio"
 
 msgid "Unnamed unclassified highway"
 msgstr "Bevardis neklasifikuotas kelias"
@@ -28221,32 +28323,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"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "voltage should be in volts with no units/delimiter/spaces"
+msgid "unusual value of {0}"
 msgstr ""
 
-msgid "unusual {0} specification"
+msgid ""
+"unusual value of {0}: kilometers is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "nestandartinė geležinkelio vežė; naudokite mm be tarpo"
-
-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"
@@ -28255,9 +28353,6 @@ msgstr "{0} privalo būti skaitinė reikšmė"
 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 ""
 
@@ -28368,6 +28463,9 @@ msgstr "Slėpti piktogramas mažai priartinus"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Mažiau į akis krintantys taškų simboliai mažai priartinus"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Rodyti gatvių pavadinimus (smarkiai priartinus)"
 
@@ -28411,6 +28509,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."
@@ -28444,6 +28545,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -28492,6 +28596,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Prancūzų EPCI (boundary=local_authority) apdorojimas"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr ""
 
@@ -28663,6 +28772,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 ""
@@ -29473,556 +29585,6 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr ""
 
-msgid "Mapillary Images"
-msgstr "Mapillary vaizdai"
-
-msgid "Mapillary layer"
-msgstr "Mapillary sluoksnis"
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr "{0} importuota nuotraukų"
-
-msgid "{0} downloaded images"
-msgstr "{0} atsiųsta nuotraukų"
-
-msgid "{0} images in total"
-msgstr ""
-
-msgid "{0} images in {1} sequences"
-msgstr ""
-
-msgid "Mapillary object layer"
-msgstr "Mapillary objektų sluoksnis"
-
-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 "Atsiųsti Mapillary vaizdus dabartiniame rodinyje"
-
-msgid "Export pictures"
-msgstr "Eksportuoti nuotraukas"
-
-msgid "Export Mapillary pictures"
-msgstr "Eksportuoti Mapillary nuotraukas"
-
-msgid "Export images"
-msgstr ""
-
-msgid "Import pictures"
-msgstr "Importuoti nuotraukas"
-
-msgid "Import local pictures"
-msgstr "Importuoti vietines nuotraukas"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Importuoti nuotraukas į Mapillary sluoksnį"
-
-msgid "Join mode"
-msgstr "Sujungimo veiksena"
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
-msgid "Submit changeset"
-msgstr "Išsiųsti pakeitimą"
-
-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 ""
-"Įvyko išimtinė situacija mėginant įkelti pakeitimą. Jei tai kartojasi, "
-"praneškite apie klaidą per Žinyno meniu. Jei šis pranešimas rodomas pirmą "
-"kartą, kartokite. Tai galėjo būti problema su interneto ryšiu."
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr "Ėjimo veiksena"
-
-msgid "Zoom to selected image"
-msgstr "Rodyti pažymėtą nuotrauką"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Priartinti pažymėtą Mapillary vaizdą"
-
-msgid "Current Mapillary changeset"
-msgstr "Dabartinis Mapillary pakeitimas"
-
-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 "Perrašyti importuotas nuotraukas"
-
-msgid "Select a directory"
-msgstr ""
-
-msgid "Explore"
-msgstr ""
-
-msgid "Speed limit"
-msgstr "Greičio apribojimas"
-
-msgid "Give way"
-msgstr "Duoti kelią"
-
-msgid "No entry"
-msgstr "Įvažiuoti draudžiama"
-
-msgid "Intersection danger"
-msgstr "Sankryžos įspėjimas"
-
-msgid "Mandatory direction (any)"
-msgstr "Privaloma kryptis (bet kokia)"
-
-msgid "Uneven road"
-msgstr "Nelygus kelias"
-
-msgid "No parking"
-msgstr "Sustoti draudžiama"
-
-msgid "No overtaking"
-msgstr "Lenkti draudžiama"
-
-msgid "Pedestrian crossing"
-msgstr "Pėsčiųjų perėja"
-
-msgid "No turn"
-msgstr "Sukti draudžiama"
-
-msgid "Years"
-msgstr "Metai"
-
-msgid "Months"
-msgstr "Mėnesiai"
-
-msgid "Days"
-msgstr "Dienos"
-
-msgid "Imported images"
-msgstr "Importuotos nuotraukos"
-
-msgid "Mapillary filter"
-msgstr "Mapillary filtras"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Atverti Mapillary filtro dialogo langą"
-
-msgid "Not older than: "
-msgstr "Ne senesnės, nei: "
-
-msgid "Downloaded images"
-msgstr "Atsiųstos nuotraukos"
-
-msgid "Only images with signs"
-msgstr "Tik nuotraukas su ženklais"
-
-msgid "Choose signs"
-msgstr "Parinkti ženklus"
-
-msgid "Mapillary history"
-msgstr "Mapillary istorija"
-
-msgid "Open Mapillary history dialog"
-msgstr "Atverti Mapillary istorijos dialogo langą"
-
-msgid "No image selected"
-msgstr ""
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr "Mapillary nuotrauka"
-
-msgid "Open Mapillary window"
-msgstr "Atverti Mapillary langą"
-
-msgid "Next picture"
-msgstr "Kita nuotrauka"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Parodo kitą nuotrauką sekoje"
-
-msgid "Previous picture"
-msgstr "Ankstesnė nuotrauka"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Parodo ankstesnę nuotrauką sekoje"
-
-msgid "Jump to red"
-msgstr "Eiti į raudoną"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Peršoka į nuotrauką kitoje raudonos linijos pusėje"
-
-msgid "Jump to blue"
-msgstr "Eiti į mėlyną"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Peršoka į nuotrauką kitoje mėlynos linijos pusėje"
-
-msgid "Stops the walk."
-msgstr "Sustabdo ėjimą."
-
-msgid "Play"
-msgstr "Leisti"
-
-msgid "Continues with the paused walk."
-msgstr "Pratęsia pristabdytą ėjimą."
-
-msgid "Pause"
-msgstr "Pristabdyti"
-
-msgid "Pauses the walk."
-msgstr "Pristabdo ėjimą."
-
-msgid "Display hour when the picture was taken"
-msgstr "Rodyti valandą kada nuotrauka padaryta"
-
-msgid "Use 24 hour format"
-msgstr "Naudoti 24 valandų formata"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr "Pereiti į nuotraukos vietą su mygtukais kita/ankstesnė"
-
-msgid "Preview images when hovering its icon"
-msgstr "Peržiūrėti nuotraukas užvedus pelę ant piktogramos"
-
-msgid "Cut off sequences at download bounds"
-msgstr "Nutraukti sekas atsiuntimo ribose"
-
-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 "Atsiuntimo veiksena"
-
-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 "Raktas nukopijuotas į iškarpinę"
-
-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 ""
-"Mapillary papildinys dabar naudoja atskirą skydelį papildomos informacijos "
-"(pvz., vaizdo rakto) rodymui ir veiksmams su dabar pažymėtu Mapillary vaizdu "
-"(pvz., peržiūra naršyklėje)."
-
-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 "Rodyti aptikimus ant vaizdo"
-
-msgid "View in browser"
-msgstr ""
-
-msgid "Copy key"
-msgstr "Kopijuoti raktą"
-
-msgid "Add Mapillary tag"
-msgstr ""
-
-msgid "Image detections"
-msgstr "Vaizdų aptikimai"
-
-msgid "Image actions"
-msgstr "Vaizdo veiksmai"
-
-msgid "Image key"
-msgstr "Vaizdo raktas"
-
-msgid "Sequence key"
-msgstr "Sekos raktas"
-
-msgid "{0} detections"
-msgstr "{0} aptikimai"
-
-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 "viską matomame plote"
-
-msgid "areas with downloaded OSM-data"
-msgstr "plotus su atsiųstais OSM duomenimis"
-
-msgid "only when manually requested"
-msgstr "tik paprašius rankiniu būdu"
-
-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 ""
 
@@ -30729,6 +30291,108 @@ 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 "Pakeisti geometriją taškui {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Pažymėkite vieną kelią, kuris egzistuoja duomenų bazėje, ir vieną naują "
+"kelią su teisinga geometrija."
+
+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 ""
+"Viršytas veiksmingo metodo iteracijų limitas, naudojamas paprastesnis "
+"metodas."
+
+msgid "Replace geometry for way {0}"
+msgstr "Pakeisti geometriją keliui {0}"
+
+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 ""
 
@@ -30762,9 +30426,30 @@ msgstr "Pastatų žymos:"
 msgid "Cannot place building outside of the world."
 msgstr "Negalima sukurti pastato už pasaulio ribų."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Sukurti pastatą"
 
+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 "Nustatyti pastatų dydžius"
 
@@ -30777,8 +30462,17 @@ msgstr "Automatiškai pažymėti pastatus"
 msgid "Use address nodes under buildings"
 msgstr "Naudoti adresų taškus po pastatais"
 
-msgid "Buildings width:"
-msgstr "Pastatų plotis:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Ilgio žingsnis:"
@@ -31470,6 +31164,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 ""
 
@@ -31966,6 +31672,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -31998,22 +31707,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"
@@ -32103,6 +31803,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -32810,7 +32513,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"
@@ -32843,31 +32564,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"
@@ -33969,6 +33751,27 @@ msgstr "Neatpažintas failo plėtinys: {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"
 
@@ -34302,6 +34105,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -35040,6 +34846,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -35456,12 +35265,6 @@ msgstr "Nauja reikšmė {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>"
@@ -35798,12 +35601,6 @@ msgstr "JOSM žymų tvarkytuvės papildinys"
 msgid "Presets"
 msgstr "Ruošiniai"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -37391,43 +37188,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 "Pakeisti geometriją taškui {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 ""
-"Pažymėkite vieną kelią, kuris egzistuoja duomenų bazėje, ir vieną naują "
-"kelią su teisinga geometrija."
-
-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 ""
-"Viršytas veiksmingo metodo iteracijų limitas, naudojamas paprastesnis "
-"metodas."
-
-msgid "Replace geometry for way {0}"
-msgstr "Pakeisti geometriją keliui {0}"
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -37501,9 +37261,6 @@ msgstr "Pažymėti centrinius taškus"
 msgid "Please select two nodes connected by way!"
 msgstr "Parinkite du taškus sujungtus keliu!"
 
-msgid "Too many ways are added: {0}!"
-msgstr ""
-
 msgid "All inside [testing]"
 msgstr "Viskas viduje [testuojama]"
 
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index 5f8dff0..04fcb05 100644
--- a/i18n/po/lv.po
+++ b/i18n/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2012-10-03 22:16+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Latvian <lv at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:52+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:52+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: lv\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -958,8 +958,8 @@ msgstr ""
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
-msgstr "Atsevišķs slānis"
+msgid "Download as new layer"
+msgstr ""
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Izvēlieties, ja datiem jābūt ielādētiem jaunā slānī"
@@ -2256,12 +2256,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"
@@ -8256,9 +8256,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>"
@@ -9715,6 +9712,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12757,9 +12757,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 ""
 
@@ -14452,6 +14449,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 ""
 
@@ -14461,10 +14462,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 ""
@@ -16288,10 +16285,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17777,6 +17770,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17798,6 +17794,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20451,6 +20450,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23522,6 +23527,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 ""
 
@@ -23603,7 +23635,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23618,7 +23650,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 ""
@@ -23626,21 +23658,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 ""
 
@@ -23779,13 +23833,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"
@@ -23818,14 +23872,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 ""
@@ -23891,7 +23945,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)"
@@ -23978,13 +24032,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)"
@@ -24152,34 +24206,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 ""
@@ -24187,7 +24240,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)"
@@ -24235,7 +24288,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24243,7 +24296,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 ""
@@ -24412,8 +24465,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 ""
@@ -24421,9 +24473,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 ""
@@ -24431,10 +24481,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"
@@ -24467,57 +24517,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 ""
@@ -24525,13 +24570,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 ""
@@ -24599,13 +24644,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 ""
@@ -24613,7 +24658,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24621,7 +24666,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24629,19 +24674,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 ""
@@ -24746,13 +24791,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 ""
@@ -24760,7 +24805,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)"
@@ -24854,13 +24899,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 ""
 
@@ -24948,6 +24986,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 ""
 
@@ -24956,6 +25008,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 ""
 
@@ -24963,13 +25039,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 ""
@@ -24983,7 +25059,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 ""
@@ -24991,29 +25067,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)"
@@ -25082,7 +25157,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"
@@ -25115,6 +25193,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 ""
 
@@ -25163,33 +25247,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 ""
@@ -25197,7 +25279,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)"
@@ -25243,25 +25325,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"
@@ -25285,7 +25367,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)"
@@ -25381,7 +25463,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 ""
@@ -25389,6 +25471,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 ""
 
@@ -25407,7 +25496,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)"
@@ -25469,7 +25558,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 ""
@@ -25477,13 +25566,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)"
@@ -25570,7 +25659,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 ""
@@ -25578,7 +25674,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"
@@ -25593,6 +25689,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26584,32 +26686,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"
@@ -26618,9 +26716,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 ""
 
@@ -26727,6 +26822,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 ""
 
@@ -26770,6 +26868,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."
@@ -26803,6 +26904,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26850,6 +26954,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 ""
 
@@ -27015,6 +27124,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 ""
@@ -27804,550 +27916,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 ""
 
@@ -29042,6 +28610,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 ""
 
@@ -29075,9 +28741,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 ""
 
@@ -29090,7 +28777,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:"
@@ -29769,6 +29465,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 ""
 
@@ -30263,6 +29971,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30295,22 +30006,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"
@@ -30400,6 +30102,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31089,7 +30794,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"
@@ -31122,31 +30845,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"
@@ -32227,6 +32011,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 ""
 
@@ -32560,6 +32365,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33297,6 +33105,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33707,12 +33518,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>"
@@ -34049,12 +33854,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35595,39 +35394,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 ""
 
@@ -35701,9 +35467,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/mk.po b/i18n/po/mk.po
index 43050e6..8d1a370 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2013-05-11 04:37+0000\n"
 "Last-Translator: Bojan Jankuloski <bojan.jankuloski at gmail.com>\n"
 "Language-Team: Macedonian <mk at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:53+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:54+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: mk\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -949,7 +949,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"
@@ -2247,12 +2247,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 ""
 
@@ -12747,9 +12747,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 ""
 
@@ -14442,6 +14439,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 ""
 
@@ -14451,10 +14452,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 ""
@@ -16278,10 +16275,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17767,6 +17760,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17788,6 +17784,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20441,6 +20440,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23512,6 +23517,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 ""
 
@@ -23593,7 +23625,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23608,7 +23640,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 ""
@@ -23616,21 +23648,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 ""
 
@@ -23769,13 +23823,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"
@@ -23808,14 +23862,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 ""
@@ -23881,7 +23935,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)"
@@ -23968,13 +24022,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)"
@@ -24142,34 +24196,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 ""
@@ -24177,7 +24230,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)"
@@ -24225,7 +24278,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24233,7 +24286,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 ""
@@ -24402,8 +24455,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 ""
@@ -24411,9 +24463,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 ""
@@ -24421,10 +24471,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"
@@ -24457,57 +24507,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 ""
@@ -24515,13 +24560,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 ""
@@ -24589,13 +24634,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 ""
@@ -24603,7 +24648,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24611,7 +24656,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24619,19 +24664,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 ""
@@ -24736,13 +24781,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 ""
@@ -24750,7 +24795,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)"
@@ -24844,13 +24889,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 ""
 
@@ -24938,6 +24976,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 ""
 
@@ -24946,6 +24998,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 ""
 
@@ -24953,13 +25029,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 ""
@@ -24973,7 +25049,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 ""
@@ -24981,29 +25057,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)"
@@ -25072,7 +25147,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"
@@ -25105,6 +25183,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 ""
 
@@ -25153,33 +25237,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 ""
@@ -25187,7 +25269,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)"
@@ -25233,25 +25315,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"
@@ -25275,7 +25357,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)"
@@ -25371,7 +25453,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 ""
@@ -25379,6 +25461,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 ""
 
@@ -25397,7 +25486,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)"
@@ -25459,7 +25548,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 ""
@@ -25467,13 +25556,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)"
@@ -25560,7 +25649,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 ""
@@ -25568,7 +25664,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"
@@ -25583,6 +25679,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26574,32 +26676,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"
@@ -26608,9 +26706,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 ""
 
@@ -26717,6 +26812,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 ""
 
@@ -26760,6 +26858,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."
@@ -26793,6 +26894,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26840,6 +26944,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 ""
 
@@ -27005,6 +27114,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 ""
@@ -27794,550 +27906,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 ""
 
@@ -29032,6 +28600,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 ""
 
@@ -29065,9 +28731,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 ""
 
@@ -29080,7 +28767,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:"
@@ -29759,6 +29455,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 ""
 
@@ -30253,6 +29961,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30285,22 +29996,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"
@@ -30390,6 +30092,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31079,7 +30784,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"
@@ -31112,31 +30835,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"
@@ -32217,6 +32001,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 ""
 
@@ -32550,6 +32355,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33287,6 +33095,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33697,12 +33508,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>"
@@ -34039,12 +33844,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35585,39 +35384,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 ""
 
@@ -35691,9 +35457,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/mr.po b/i18n/po/mr.po
index 6563e99..01fb0b8 100644
--- a/i18n/po/mr.po
+++ b/i18n/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2015-05-24 23:45+0000\n"
 "Last-Translator: Singleton <singleton47+ubuntuone at live.com>\n"
 "Language-Team: Marathi <mr at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:54+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:54+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: mr\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -965,8 +965,8 @@ msgstr ""
 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 ""
@@ -2271,12 +2271,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"
@@ -8274,9 +8274,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>"
@@ -9729,6 +9726,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12782,9 +12782,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 ""
 
@@ -14477,6 +14474,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 ""
 
@@ -14486,10 +14487,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 ""
@@ -16313,10 +16310,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17802,6 +17795,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17823,6 +17819,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20476,6 +20475,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23547,6 +23552,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 ""
 
@@ -23628,7 +23660,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23643,7 +23675,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 ""
@@ -23651,21 +23683,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 ""
 
@@ -23804,13 +23858,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"
@@ -23843,14 +23897,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 ""
@@ -23916,7 +23970,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)"
@@ -24003,13 +24057,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)"
@@ -24177,34 +24231,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 ""
@@ -24212,7 +24265,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)"
@@ -24260,7 +24313,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24268,7 +24321,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 ""
@@ -24437,8 +24490,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 ""
@@ -24446,9 +24498,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 ""
@@ -24456,10 +24506,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"
@@ -24492,57 +24542,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 ""
@@ -24550,13 +24595,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 ""
@@ -24624,13 +24669,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 ""
@@ -24638,7 +24683,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24646,7 +24691,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24654,19 +24699,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 ""
@@ -24771,13 +24816,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 ""
@@ -24785,7 +24830,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)"
@@ -24879,13 +24924,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 ""
 
@@ -24973,6 +25011,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 ""
 
@@ -24981,6 +25033,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 ""
 
@@ -24988,13 +25064,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 ""
@@ -25008,7 +25084,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 ""
@@ -25016,29 +25092,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)"
@@ -25107,7 +25182,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"
@@ -25140,6 +25218,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 ""
 
@@ -25188,33 +25272,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 ""
@@ -25222,7 +25304,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)"
@@ -25268,25 +25350,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"
@@ -25310,7 +25392,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)"
@@ -25406,7 +25488,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 ""
@@ -25414,6 +25496,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 ""
 
@@ -25432,7 +25521,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)"
@@ -25494,7 +25583,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 ""
@@ -25502,13 +25591,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)"
@@ -25595,7 +25684,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 ""
@@ -25603,7 +25699,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"
@@ -25618,6 +25714,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26609,32 +26711,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"
@@ -26643,9 +26741,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 ""
 
@@ -26752,6 +26847,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 ""
 
@@ -26795,6 +26893,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."
@@ -26828,6 +26929,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26875,6 +26979,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 ""
 
@@ -27040,6 +27149,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 ""
@@ -27829,550 +27941,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 ""
 
@@ -29067,6 +28635,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 ""
 
@@ -29100,9 +28766,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 ""
 
@@ -29115,7 +28802,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:"
@@ -29794,6 +29490,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 ""
 
@@ -30288,6 +29996,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30320,22 +30031,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"
@@ -30425,6 +30127,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31114,7 +30819,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"
@@ -31147,31 +30870,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"
@@ -32252,6 +32036,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 ""
 
@@ -32585,6 +32390,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33322,6 +33130,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33732,12 +33543,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>"
@@ -34074,12 +33879,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35620,39 +35419,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 ""
 
@@ -35726,9 +35492,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/ms.po b/i18n/po/ms.po
index 58b2f9c..99cee8c 100644
--- a/i18n/po/ms.po
+++ b/i18n/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2011-12-11 22:14+0000\n"
 "Last-Translator: abuyop <Unknown>\n"
 "Language-Team: Malay <ms at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:54+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:54+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: ms\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/nb.po b/i18n/po/nb.po
index 14f58ce..be8a040 100644
--- a/i18n/po/nb.po
+++ b/i18n/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2017-12-28 07:50+0000\n"
 "Last-Translator: Nka Mapper <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:56+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:56+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: nb\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1003,8 +1003,8 @@ msgstr "Oppgi URL for nedlasting:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Oppgi link til innholdet som skal lastes ned"
 
-msgid "Separate Layer"
-msgstr "Separat lag"
+msgid "Download as new layer"
+msgstr "Last ned som nytt lag"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Velg hvis innholdet skal lastes ned i et eget lag"
@@ -2349,12 +2349,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"
@@ -8400,9 +8400,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr "Last ned som nytt lag"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9885,6 +9882,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12973,9 +12973,6 @@ msgstr "Remote Control"
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr ""
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14683,6 +14680,10 @@ msgstr "Behold programtillegg"
 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 ""
 
@@ -14692,10 +14693,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 ""
@@ -16529,10 +16526,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -18018,6 +18011,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -18039,6 +18035,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20692,6 +20691,12 @@ msgstr "Fontene"
 msgid "Water Well"
 msgstr "Brønn"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Fyrtårn"
 
@@ -23767,6 +23772,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 ""
 
@@ -23848,7 +23880,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23863,7 +23895,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 ""
@@ -23871,21 +23903,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 ""
 
@@ -24024,13 +24078,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"
@@ -24063,14 +24117,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 ""
@@ -24136,7 +24190,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)"
@@ -24223,13 +24277,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)"
@@ -24397,34 +24451,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 ""
@@ -24432,7 +24485,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)"
@@ -24480,7 +24533,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24488,7 +24541,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 ""
@@ -24657,8 +24710,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 ""
@@ -24666,9 +24718,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 ""
@@ -24676,10 +24726,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"
@@ -24712,57 +24762,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 ""
@@ -24770,13 +24815,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 ""
@@ -24844,13 +24889,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 ""
@@ -24858,7 +24903,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24866,7 +24911,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24874,19 +24919,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 ""
@@ -24991,13 +25036,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 ""
@@ -25005,7 +25050,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)"
@@ -25099,13 +25144,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 ""
 
@@ -25193,6 +25231,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 ""
 
@@ -25201,6 +25253,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 ""
 
@@ -25208,13 +25284,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 ""
@@ -25228,7 +25304,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 ""
@@ -25236,29 +25312,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)"
@@ -25327,7 +25402,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"
@@ -25360,6 +25438,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 ""
 
@@ -25408,33 +25492,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 ""
@@ -25442,7 +25524,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)"
@@ -25488,25 +25570,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"
@@ -25530,7 +25612,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)"
@@ -25626,7 +25708,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 ""
@@ -25634,6 +25716,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 ""
 
@@ -25652,7 +25741,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)"
@@ -25714,7 +25803,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 ""
@@ -25722,13 +25811,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)"
@@ -25815,7 +25904,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 ""
@@ -25823,7 +25919,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"
@@ -25838,6 +25934,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26835,32 +26937,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"
@@ -26869,9 +26967,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 ""
 
@@ -26978,6 +27073,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 ""
 
@@ -27021,6 +27119,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."
@@ -27054,6 +27155,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -27104,6 +27208,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 ""
 
@@ -27277,6 +27386,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr "Tillater å åpne gpx/osm filer som går utenfor aktuelt skjermbilde"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr "Starter visning av SVG bilde av aktuelt skjermutsnitt i FireFox."
@@ -28072,550 +28184,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 "Importer"
-
-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 ""
 
@@ -29310,6 +28878,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 ""
 
@@ -29343,9 +29009,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 ""
 
@@ -29358,7 +29045,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:"
@@ -30058,6 +29754,18 @@ msgstr "Fjern valgte palett fra lista."
 msgid "Color Schemes"
 msgstr "Farge Palett"
 
+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 ""
 
@@ -30552,6 +30260,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30584,22 +30295,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"
@@ -30692,6 +30394,9 @@ msgstr "Globalsat-import"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Import Data fra Globalsat Datalogger DG100 til GPX lag."
 
+msgid "Import"
+msgstr "Importer"
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31381,7 +31086,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"
@@ -31414,31 +31137,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"
@@ -32529,6 +32313,27 @@ msgstr "Ukjent filtype {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Klarte ikke lese fil «{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"
 
@@ -32863,6 +32668,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33600,6 +33408,9 @@ msgstr ""
 msgid "State"
 msgstr "Delstat/provins"
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -34010,12 +33821,6 @@ msgstr "Ny verdi for {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr "Klarte ikke åpne tilkobling til 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>"
@@ -34354,12 +34159,6 @@ msgstr "JOSM tilleggsprogram for Egenskaper"
 msgid "Presets"
 msgstr "Objektmaler"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr "Fremhev"
 
@@ -35904,39 +35703,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 ""
 
@@ -36010,9 +35776,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/nds.po b/i18n/po/nds.po
index 60dc76e..9701f36 100644
--- a/i18n/po/nds.po
+++ b/i18n/po/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2009-11-29 09:01+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: German, Low <nds at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:55+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:55+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: \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"
@@ -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/nl.po b/i18n/po/nl.po
index 935460e..3937974 100644
--- a/i18n/po/nl.po
+++ b/i18n/po/nl.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-10 12:19+0000\n"
-"Last-Translator: DiGro <Unknown>\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-27 14:40+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Dutch\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:41+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:40+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: nl\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1048,8 +1048,8 @@ msgstr "Voer URL om te downloaden in:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Voer een URL in waarvandaan de gegevens gedownload moeten worden"
 
-msgid "Separate Layer"
-msgstr "Laag scheiden"
+msgid "Download as new layer"
+msgstr "Als nieuwe laag downloaden"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Selecteer als de data naar een nieuwe laag moet worden gedownload"
@@ -2477,29 +2477,33 @@ msgid "Confirmation"
 msgstr "Bevestiging"
 
 msgid "Export GPX file starting from first member"
-msgstr ""
+msgstr "GPX-bestand exporteren, beginnend vanaf eerste lid"
 
 msgid "Export GPX file starting from last member"
-msgstr ""
+msgstr "GPX-bestand exporteren, beginnend vanaf laatste lid"
 
 msgid "Convert to GPX layer starting from first member"
-msgstr ""
+msgstr "Naar GPX-laag converteren, beginnend vanaf eerste lid"
 
 msgid "Convert to GPX layer starting from last member"
-msgstr ""
+msgstr "Naar GPX-laag converteren, beginnend vanaf laatste lid"
 
 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 ""
+"Vlak deze relatie recursief af tot één enkel GPX-spoor, beginnend met het "
+"eerste lid, doorlopend tot en met het laatste."
 
 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 ""
+"Vlak deze relatie recursief af tot één enkel GPX-spoor, beginnend met het "
+"laatste lid, doorlopend tot en met het eerste."
 
 msgid "Selected Relations"
-msgstr ""
+msgstr "Geselecteerde relations"
 
 msgid "List of recent relations"
 msgstr "Lijst met recente relaties"
@@ -9074,9 +9078,6 @@ msgstr "Waarde voor breedtegraad in bereik [-90,90] vereist."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Waarde voor lengtegraad in bereik [-180,180] vereist."
 
-msgid "Download as new layer"
-msgstr "Als nieuwe laag downloaden"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10772,6 +10773,9 @@ msgstr "Geen gegevens gevonden in bestand \"{0}\"."
 msgid "Open OSM file"
 msgstr "Open OSM-bestand"
 
+msgid "OSM Server Files XZ compressed"
+msgstr "OSM Serverbestanden XZ gecompirmeerd"
+
 msgid "Validation Error Files"
 msgstr "Bestanden Fouten validatie"
 
@@ -10827,10 +10831,10 @@ msgid "Load tile"
 msgstr "Tegel laden"
 
 msgid "Get tile status"
-msgstr ""
+msgstr "Status tegel ophalen"
 
 msgid "Force tile rendering"
-msgstr ""
+msgstr "Renderen van tegel forceren"
 
 msgid "Failed to create tile source"
 msgstr "Maken van bron voor tegels mislukt"
@@ -10947,8 +10951,8 @@ msgstr "Beschrijving: {0}"
 
 msgid "{0} track, {1} track segments"
 msgid_plural "{0} tracks, {1} track segments"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} spoor, {1} spoorsegment"
+msgstr[1] "{0} sporen, {1} spoorsegmenten"
 
 msgid "Timespan"
 msgstr "Tijsduur"
@@ -10957,7 +10961,7 @@ msgid "Length"
 msgstr "Lengte"
 
 msgid "Number of<br/>Segments"
-msgstr ""
+msgstr "Aantal<br/>segmenten"
 
 msgid "Length: {0}"
 msgstr "Lengte: {0}"
@@ -10979,29 +10983,30 @@ msgstr[1] "{0} sporen,"
 
 msgid " ({0} segment)"
 msgid_plural " ({0} segments)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] " ({0} segment)"
+msgstr[1] " ({0} segmenten)"
 
 msgid "Save GPX file"
 msgstr "GPX-bestand opslaan"
 
 msgid "Collect segments of all tracks and combine in a single track."
 msgstr ""
+"Segmenten van alle sporen verzamelen en combineren tot één enkel spoor."
 
 msgid "Combine tracks of this layer"
-msgstr ""
+msgstr "Sporen van deze laag combineren"
 
 msgid "Split multiple track segments of one track into multiple tracks."
-msgstr ""
+msgstr "Meerdere spoorsegmenten van één spoor splitsen naar meerdere sporen."
 
 msgid "Split track segments to tracks"
-msgstr ""
+msgstr "Spoorsegmenten splitsen naar sporen"
 
 msgid "Split the tracks of this layer to one new layer each."
-msgstr ""
+msgstr "De sporen van deze laag spltsen tot elk één nieuwe laag."
 
 msgid "Split tracks to new layers"
-msgstr ""
+msgstr "Sporen naar nieuwe lagen splitsen"
 
 msgid "Id"
 msgstr "ID"
@@ -11050,11 +11055,15 @@ msgid ""
 "Trying to delete the layer with background upload. Please wait until the "
 "upload is finished."
 msgstr ""
+"De laag met geüploade achtergrond proberen te verwijderen. Wacht tot het "
+"uploaden is voltooid."
 
 msgid ""
 "A background upload is already in progress. Cannot reset state until the "
 "upload is finished."
 msgstr ""
+"Uploaden van de achtergrond wordt al uitgevoerd. Kan de status niet "
+"herstellen totdat het uploaden is voltooid."
 
 msgid "{0} note"
 msgid_plural "{0} notes"
@@ -14184,9 +14193,6 @@ msgstr "Afstandsbediening"
 msgid "Settings for the remote control feature."
 msgstr "Instellingen voor de mogelijkheid voor afstandsbediening."
 
-msgid "Download objects to new layer"
-msgstr "Download objecten naar nieuwe laag"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Bevestig alle acties van de Afstandsbediening handmatig"
 
@@ -15715,10 +15721,10 @@ msgid "Do you want to allow this?"
 msgstr "Wil je dit toestaan?"
 
 msgid "Yes, always"
-msgstr ""
+msgstr "Ja, altijd"
 
 msgid "Yes, once"
-msgstr ""
+msgstr "Ja, eenmaal"
 
 msgid "Confirm Remote Control action"
 msgstr "Bevestig actie van Afstandsbediening"
@@ -16120,6 +16126,12 @@ msgstr "Plug-in behouden"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Klik om de plug-in ''{0}'' te behouden"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Installeren plug-in ''{0}'' uit tijdelijk gedownload bestand ''{1}'' "
+"mislukt. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Verwijderden van verouderde plug-in ''{0}'' mislukt."
 
@@ -16131,12 +16143,6 @@ msgstr ""
 "overgeslagen. JOSM zal nog steeds de oude versie van de plug-in laden."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Installeren plug-in ''{0}'' uit tijdelijk gedownload bestand ''{1}'' "
-"mislukt. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -18147,10 +18153,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "dak"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "kiosk"
-
 msgid "Start date"
 msgstr "Begindatum"
 
@@ -19661,6 +19663,9 @@ msgstr "Biodiesel"
 msgid "Octane 80"
 msgstr "Octaan 80"
 
+msgid "Octane 87"
+msgstr "Octaan 87"
+
 msgid "Octane 91"
 msgstr "91 Octaan"
 
@@ -19682,6 +19687,9 @@ msgstr "E10 (10% Ethanol mix)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol mix)"
 
+msgid "Ethanol (alcohol)"
+msgstr "Ethanol (alcohol)"
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Vloeibaar petroleumgas)"
 
@@ -22340,6 +22348,12 @@ msgstr "Fontein"
 msgid "Water Well"
 msgstr "Waterbron"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Vuurtoren"
 
@@ -22953,7 +22967,7 @@ msgstr "zekering"
 
 msgctxt "power"
 msgid "disconnector"
-msgstr ""
+msgstr "onderbreker"
 
 msgctxt "power"
 msgid "earthing"
@@ -25440,6 +25454,39 @@ msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr ""
 "Overlayafbeelding voor in kaart brengen pistes in OSM. Dagelijks bijgewerkt."
 
+msgid "OpenRailwayMap"
+msgstr "OpenRailwayMap"
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr "Overlegafbeeldingen voor in kaart brengen van spoorwegen in OSM"
+
+msgid "OpenInfraMap Telecoms"
+msgstr "OpenInfraMap Telecoms"
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Overlegafbeeldingen voor in kaart brengen van de infrastructuur van "
+"telecommunicatie in OSM. Dagelijks bijgewerkt."
+
+msgid "OpenInfraMap Power"
+msgstr "OpenInfraMap Power"
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Overlegafbeeldingen voor in kaart brengen van de infrastructuur van "
+"electriciteit in OSM. Dagelijks bijgewerkt."
+
+msgid "OpenInfraMap Petroleum"
+msgstr "OpenInfraMap Petroleum"
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Overlegafbeeldingen voor in kaart brengen van de infrastructuur van "
+"olieindustrie in OSM. Dagelijks bijgewerkt."
+
 msgid "skobbler"
 msgstr "skobbler"
 
@@ -25521,8 +25568,8 @@ msgstr "OSM Inspector: Adressen"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM Inspector: Kustlijn (EU)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
+msgstr "imagico.de: Prokletije Mountains"
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
@@ -25539,8 +25586,8 @@ msgid ""
 msgstr ""
 "Straten & gebouwen verschaft door de gemeente Tirana, gehostd door 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 "
@@ -25549,25 +25596,46 @@ msgstr ""
 "Buiten normale bedekking van Landsat en daarom niet in LIMA en Bing/Mapbox "
 "(ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
-msgstr "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: 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 ""
 "Vrij heldere up-to-date afbeelding voor bijwerken van randen van gletsers "
 "(ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgid "imagico.de: Bunger Hills"
 msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: Enderby Land en Kemp Coast"
+
+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 en Kemp Coast"
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 "Sentinel-2-afbeeldingen van Enderby Land en Kemp Coast (ware kleuren)"
 
+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 topografische kaart (TMS)"
 
@@ -25706,16 +25774,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-afbeeldingen voor in kaart brengen: Bahía Blanca (laagtij)"
+msgid "imagico.de: Bahía Blanca (low tide)"
+msgstr "imagico.de: Bahía Blanca (laagtij)"
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr "Getijdeplaten en eilanden aan de kust (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: Bahía Blanca (hoogtij)"
+msgid "imagico.de: Bahía Blanca (high tide)"
+msgstr "imagico.de: Bahía Blanca (hoogtij)"
 
 msgid "AGRI black-and-white 2.5m"
 msgstr "AGRI zwart-wit 2.5m"
@@ -25747,8 +25813,8 @@ msgstr "LPI NSW Administratieve grenzen State Forest"
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW Administratieve grenzen NPWS Reserve"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
-msgstr "imagico.de OSM images for mapping: Northwest Heard Island"
+msgid "imagico.de: Northwest Heard Island"
+msgstr "imagico.de: Northwest Heard Island"
 
 msgid ""
 "Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
@@ -25756,8 +25822,8 @@ msgstr ""
 "Gletsers van Northwest Heard Island (intussen in kaart gebracht) (valse "
 "kleur IR)"
 
-msgid "imagico.de OSM images for mapping: Heard Island coast"
-msgstr "imagico.de OSM images for mapping: Heard Island coast"
+msgid "imagico.de: Heard Island coast"
+msgstr "imagico.de: Heard Island coast"
 
 msgid ""
 "Recent image of Heard island with interior mostly cloud covered but mostly "
@@ -25778,6 +25844,8 @@ msgstr "basemap.at Orthofoto"
 msgid ""
 "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery."
 msgstr ""
+"Luchtfotolaag verschaft door basemap.at. \"Opvolger\" van afbeeldingen van "
+"geoimage.at."
 
 msgid "Geoimage.at MaxRes"
 msgstr "Geoimage.at MaxRes"
@@ -25824,8 +25892,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 (Belgische stijl)"
@@ -25911,16 +25979,16 @@ msgstr "TEC bushaltes"
 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 ""
 "Gedeeltelijk en gedeeltelijk bewolkte bedekking in normale bronnen (ware "
 "kleuren)"
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
-msgstr "imagico.de OSM images for mapping: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
+msgstr "imagico.de: Bouvet Island"
 
 msgid "For more accurate coastline and glacier mapping (true color)"
 msgstr ""
@@ -26091,14 +26159,14 @@ msgstr "Hoge kwalieit luchtofoto van Kelowna"
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna Wegen overlay"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
-msgstr "imagico.de OSM images for mapping: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
+msgstr "imagico.de: Eastern Devon Island coast"
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr "Kustlijn ondertussen meeste in kaart gebracht (false color IR)"
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
-msgstr "imagico.de OSM images for mapping: Northern Ellesmere Island"
+msgid "imagico.de: Northern Ellesmere Island"
+msgstr "imagico.de: Northern Ellesmere Island"
 
 msgid ""
 "Assembled from July 2012 ASTER imagery (true color with estimated blue)"
@@ -26106,11 +26174,8 @@ msgstr ""
 "Samengesteld uit afbeeldingen van ASTER uit juli 2012 (ware kleuren met "
 "geschat blauw)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: Northern Ellesmere Island "
-"July 2016"
+msgid "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)"
@@ -26118,14 +26183,14 @@ msgstr ""
 "Samengesteld uit afbeeldingen van ASTER uit juli 2016 (ware kleuren met "
 "geschat blauw)"
 
-msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
-msgstr "imagico.de OSM images for mapping: Fogo, Cape Verde"
+msgid "imagico.de: Fogo, Cape Verde"
+msgstr "imagico.de: Fogo, Cape Verde"
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr "Afbeelding van na de uitbarsting van 2014/2015 (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
-msgstr "imagico.de OSM images for mapping: Isla Londonderry"
+msgid "imagico.de: Isla Londonderry"
+msgstr "imagico.de: Isla Londonderry"
 
 msgid ""
 "A lot of very coarse coastlines could be improved here, much snow cover "
@@ -26135,8 +26200,8 @@ msgstr ""
 "door sneeuw bedekt dus niet te gebruiken voor in kaart brengen van gletsjers "
 "(valse kleur IR)"
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
-msgstr "imagico.de OSM images for mapping: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
+msgstr "imagico.de: Volcán Calbuco"
 
 msgid "Image from after the 2015 eruption (true color)"
 msgstr "Afbeelding van na de uitbarsting van 2015 (ware kleuren)"
@@ -26183,8 +26248,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 "
@@ -26193,10 +26258,8 @@ msgstr ""
 "2007 ASTERafbeelding die betere bedekking voor gletsjers biedt dan de gewone "
 "bronnen (ware kleuren met geschat blauw)"
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: Darwin and Wolf islands, "
-"Galapagos"
+msgid "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 "
@@ -26221,7 +26284,7 @@ msgid "Estonia Forestry (Maaamet)"
 msgstr "Estonia Forestry (Maaamet)"
 
 msgid "Nordic snowmobile overlay"
-msgstr ""
+msgstr "Overleg Noordse sneeuwmobielen"
 
 msgid "Kelkkareitit.fi snowmobile trails from OSM (Nordic coverage)"
 msgstr "Kelkkareitit.fi snowmobiel sporen van OSM (Noordse bedekking)"
@@ -26345,7 +26408,7 @@ msgid "Deutsche Bahn VzG lines Nov 2015"
 msgstr "Deutsche Bahn VzG lijnen november 2015"
 
 msgid "Deutsche Bahn VzG lines January 2017"
-msgstr ""
+msgstr "Deutsche Bahn VzG lijnen januari 2017"
 
 msgid "Erlangen aerial imagery (2016 5.0 cm)"
 msgstr "Erlangen luchtfoto''s (2016 5.0 cm)"
@@ -26369,10 +26432,8 @@ msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr "Metropool Ruhr: Luchtfoto (10 cm)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
-msgstr ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: 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 "
@@ -26381,12 +26442,8 @@ msgstr ""
 "Bijgewerkte afbeelding van laagtij van de kust voor bijwerken van in kaart "
 "brengen van droogvallende banken en ondiepten (ware kleuren)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
-msgstr ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: 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 "
@@ -26395,13 +26452,11 @@ msgstr ""
 "Bijgewerkte afbeelding van laagtij van de kust voor bijwerken van in kaart "
 "brengen van droogvallende banken en ondiepten (valse kleur IR)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: North Sea Coast 2016"
+msgid "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-afbeeldingen voor in kaart brengen: North Sea Coast 2017"
+msgid "imagico.de: North Sea Coast 2017"
+msgstr "imagico.de: North Sea Coast 2017"
 
 msgid "Saxony latest aerial imagery"
 msgstr "Saksen laatste luchtfoto’s"
@@ -26433,22 +26488,21 @@ msgstr "Mainz laatste luchtfoto’s"
 msgid "Munich latest aerial imagery 60cm"
 msgstr "München laatste luchtfoto’s 60cm"
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
-msgstr "imagico.de OSM images for mapping: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
+msgstr "imagico.de: Qasigiannguit"
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 "Icebridge DMSafbeelding van de nederzetting - uitlijning kan slecht zijn"
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
-msgstr "imagico.de OSM images for mapping: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
+msgstr "imagico.de: Thule Air Base"
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr "Icebridge DMSafbeelding - uitlijning kan slecht zijn"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: Kangerlussuaq herfst"
+msgid "imagico.de: Kangerlussuaq Autumn"
+msgstr "imagico.de: Kangerlussuaq herfst"
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
@@ -26456,9 +26510,8 @@ msgstr ""
 "Icebridge DMS afbeelding van het vliegveld en de nederzetting - uitlijning "
 "zou slecht kunnen zijn"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: Kangerlussuaq voorjaar"
+msgid "imagico.de: Kangerlussuaq Spring"
+msgstr "imagico.de: Kangerlussuaq voorjaar"
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
@@ -26466,39 +26519,28 @@ msgstr ""
 "Icebridge DMS afbeelding van het vliegveld en de wegen - uitlijning zou "
 "slecht kunnen zijn"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: 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 DMSluchtfoto’s van Thule Airbase - uitlijning kan slecht zijn"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
-"2015"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: 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-afbeeldingen voor in kaart brengen: 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 - mozaiëk van Groenland (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
-msgstr "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
+msgid "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 "
@@ -26508,18 +26550,16 @@ msgstr ""
 "meest bedekt met sneeuw uit het seizoen, dus moeilijk te interpreteren (ware "
 "kleuren)"
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: Landsat off-nadir July "
-"2016"
+msgid "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 ""
 "Laatste afbeeldingen ten noorden van de normale grens van Landsat (ware "
 "kleuren)"
 
-msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
-msgstr "imagico.de OSM images for mapping: Northern Greenland ASTER"
+msgid "imagico.de: Northern Greenland ASTER"
+msgstr "imagico.de: Northern Greenland ASTER"
 
 msgid ""
 "Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
@@ -26588,14 +26628,14 @@ msgstr "OpenStreetMap Hongarije (wandelroutes)"
 msgid "Hillshade Hungary"
 msgstr "Hillshade Hongarije"
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
-msgstr "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
+msgstr "imagico.de: Eastern Iceland"
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr "Ontbrekende eilandjes en onnauwkeurige kust (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
-msgstr "imagico.de OSM images for mapping: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
+msgstr "imagico.de: Rann of Kutch"
 
 msgid ""
 "Land/water distinction difficult to properly map based on Bing/Mapbox images "
@@ -26604,9 +26644,8 @@ msgstr ""
 "Onderscheid land/water moeilijk in kaart te brengen, gebaseerd op "
 "afbeeldingen van Bing/Mapbox (false color IR)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: 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 "
@@ -26615,8 +26654,8 @@ msgstr ""
 "Oudere afbeelding van de Sudirman Range zonder sneeuw die het bereik van de "
 "gletsjer weergeeft (ware kleuren)"
 
-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 "
@@ -26625,21 +26664,20 @@ msgstr ""
 "Ontbrekende eilanden en ruwe kustlijn vanwege bedekking door wolken in Bing, "
 "meren zouden ook wat aanvullend detail kunnen gebruiken (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
-msgstr "imagico.de OSM images for mapping: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
+msgstr "imagico.de: Bakun Reservoir"
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr "Ontbrekend in oudere afbeeldingen van vóór 2011 (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Batam"
-msgstr "imagico.de OSM images for mapping: Batam"
+msgid "imagico.de: Batam"
+msgstr "imagico.de: Batam"
 
 msgid "Missing Islands in OSM (true color)"
 msgstr "Ontbrekende eilanden in OSM (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: 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)"
@@ -26746,18 +26784,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-afbeeldingen voor in kaart brengen: Aral Sea (niveau laag "
-"water)"
+msgid "imagico.de: Aral Sea (low water level)"
+msgstr "imagico.de: Aral Sea (niveau laag water)"
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr "Water en bereik nat land, dammen etc. (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: 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 "
@@ -26766,8 +26800,8 @@ msgstr ""
 "Water en bereik nat land, dammen etc. - sommige in het noorden blijven ijs "
 "(ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
-msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: 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 "Bijgewerkte afbeelding voor in kaart brengen gletsjer (ware kleuren)"
@@ -26826,10 +26860,10 @@ msgstr ""
 "kaartseries."
 
 msgid "Kartverket Hillshade overlay"
-msgstr ""
+msgstr "Overleg Kartverket Hillshade"
 
 msgid "Hillshade for Norway"
-msgstr ""
+msgstr "Schaduw voor heuvels van Noorwegen"
 
 msgid "Kartverket Nautical Charts"
 msgstr "Kartverket Nautiscje kaarten"
@@ -26860,6 +26894,8 @@ msgid ""
 "Trails from the Norwegian database of `Tur og Friluftsruter´. Selectable "
 "categories for foot, bike and ski trails."
 msgstr ""
+"Sporen uit de Noorse database van `Tur og Friluftsruter´. Selecteerbare "
+"categorieën voor voet-, fiets- en skisporen."
 
 msgid "Kartverket Place Names overlay"
 msgstr "Kartverket Plaatsnamen overlay"
@@ -26869,14 +26905,6 @@ msgid ""
 msgstr ""
 "Officiële Noorse plaatsnamen uit de SSR-database. Categorieën te selecteren."
 
-msgid "MTBmap.no"
-msgstr "MTBmap.no"
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-"Noorse mountainbikekaart van OSM (max zoom 14-16, varieert per regio)"
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr "Kartverket DTM Digital Terrain Model"
 
@@ -26906,15 +26934,18 @@ msgid "Kartverket Historic maps"
 msgstr "Kartverket Historische kaarten"
 
 msgid "Historic maps - for the time being `Amtskartserien´ 1826-1917."
-msgstr ""
+msgstr "Historische kaarten - voorlopig `Amtskartserien´ 1826-1917."
 
 msgid "Kartverket Economic Maps (historic)"
-msgstr ""
+msgstr "Kartverket Economische kaarten (historisch)"
 
 msgid ""
 "1st edition of historic Economic maps for Norway 1960-90s (`Økonomisk "
 "kartverk´). Available from zoom 16. Please correct local imagery offset."
 msgstr ""
+"1ste editie van historische Economische kaarten voor Noorwegen 1960-90''s "
+"(`Økonomisk kartverk´). Beschikbaar vanaf zoom 16. Corrigeer de verschuiving "
+"van de lokale afbeelding."
 
 msgid "Kartverket Administrative Boundaries overlay"
 msgstr "Kartverket Administratieve grenzen overlay"
@@ -26923,6 +26954,8 @@ msgid ""
 "Official administrative boundaries at the national, county and municipality "
 "levels"
 msgstr ""
+"Officiële administratieve grenzen op nationaal, provincie en gemeentelijk "
+"niveau"
 
 msgid "Kartverket Cadastral overlay"
 msgstr "Kartverket Kadastrale overlay"
@@ -26931,45 +26964,74 @@ msgid ""
 "Real estate boundaries from the official land register (`matrikkelen´). "
 "Monthly update."
 msgstr ""
+"Grenzen van vastgoed uit het officiële landregister (`matrikkelen´). "
+"Maandelijks bijgewerkt."
 
 msgid "Kartverket Aviation Obstructions overlay"
-msgstr ""
+msgstr "Overleg Kartverket Obstructies luchtverkeer"
 
 msgid ""
 "Vertical obstructions to aircrafts, above 15m in rural areas and 30m in "
 "urban areas (e.g. masts, towers, high buildings, power lines)"
 msgstr ""
+"Verticale obstructies voor vliegtuigen, boven 15m in landelijke gebieden en "
+"30m in stedelijke gebied (bijv. masten, zendmasten, hoge gebouwen, "
+"electriciteitslijnen)"
 
 msgid "NVE Electricity Network overlay"
-msgstr ""
+msgstr "Overleg NVE Elektriciteitsnetwerk"
 
 msgid ""
 "Power lines (high voltage network) including transformers, submarine cables "
 "and pylons. Local distribution network is not included."
 msgstr ""
+"Elektriciteitslijnen (hoog voltagenetwerk) inclusief transformatoren, kabels "
+"onder water en pylonen. Lokaal distributienetwerk is niet opgenomen."
 
 msgid "NVE Hydropower Plants overlay"
-msgstr ""
+msgstr "Overleg NVE Waterkrachtcentrales"
 
 msgid ""
 "Hydropower plants including waterways (tunnel, canal, pipeline) and dams"
 msgstr ""
+"Waterkrachtcentrales inclusief waterwegen (tunnel, kanaal, pijplijn) en  "
+"dammen"
 
 msgid "NVE Wind Power Plants overlay"
-msgstr ""
+msgstr "Overleg NVE Windkrachtcentrales"
 
 msgid ""
 "Wind power turbines, farms and concession areas. Red colour = concession "
 "denied."
 msgstr ""
+"Windkrachtturbines, -parken en gebieden voor concessies. Rode kleur = "
+"concessie afgewezen."
 
 msgid "NPD Offshore Installations overlay"
-msgstr ""
+msgstr "Overleg NPD Offshore-installaties"
 
 msgid ""
 "Production platforms and oil/natural gas fields on the Norwegian continental "
 "shelf"
 msgstr ""
+"Productieplatformen en olie-/natuurlijk gasvelden op het Noorse continentale "
+"plat"
+
+msgid "Kystverket Aquaculture overlay"
+msgstr ""
+
+msgid "Aquaculture/marine farms"
+msgstr ""
+
+msgid "Kystverket Navigational Aid overlay"
+msgstr "Overleg Kystverket Navigatiehulp"
+
+msgid ""
+"Beacons, buoys, lights and fairways maintained by the Norwegian Coastal "
+"Administration"
+msgstr ""
+"Bakens, boeien, lichten en doorgangen, onderhouden door de Norwegian Coastal "
+"Administration"
 
 msgid "Miljødirektoratet Protected Areas overlay"
 msgstr "Miljødirektoratet Beschermde gebieden overlay"
@@ -26981,6 +27043,36 @@ msgstr ""
 "Noorse nationale parken, natuurbeschermingsgebieden en andere beschermde "
 "gebieden en objecten van Naturbase, inclusief Svalbard/Spitsbergen"
 
+msgid "Riksantikvaren Heritage Sites overlay"
+msgstr "Overleg Riksantikvaren Heritage Sites"
+
+msgid ""
+"Archeological and architectural monuments/sites and cultural environments "
+"protected by law (''enkeltminner'') from the Norwegian Directorate for "
+"Cultural Heritage"
+msgstr ""
+"Archeologische en architectonische monumenten/plaatsen en culturele "
+"omgevingen, bij wet beschermd (''enkeltminner'') van het Norwegian "
+"Directorate for Cultural Heritage"
+
+msgid "SSB Urban Areas overlay"
+msgstr "Overleg SSB Stedelijke gebied"
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+"Menselijke nederzettingen van tenminste 200 personen met een afstand van "
+"minder dan 200 meter tussen huishoudens"
+
+msgid "MTBmap.no"
+msgstr "MTBmap.no"
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+"Noorse mountainbikekaart van OSM (max zoom 14-16, varieert per regio)"
+
 msgid "NP Svalbard Orthophoto"
 msgstr "NP Svalbard Luchtfoto"
 
@@ -26989,14 +27081,14 @@ msgid ""
 msgstr ""
 "Luchtfoto voor Svalbard/Spitsbergen van het Norwegian Polar Institute"
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
-msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Svalbard mozaïek"
+msgid "imagico.de: Svalbard mosaic"
+msgstr "imagico.de: Svalbard mozaïek"
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr "Sentinel-2-mozaiëk van Svalbard (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
-msgstr "imagico.de OSM images for mapping: Western Karakoram"
+msgid "imagico.de: Western Karakoram"
+msgstr "imagico.de: Western Karakoram"
 
 msgid ""
 "Represents approximately minimum snow cover so can be well used for glacier "
@@ -27011,10 +27103,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-afbeeldingen voor in kaart brengen: 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 "
@@ -27023,35 +27113,33 @@ msgstr ""
 "Nieuwe sluizen met minder wolken dan in de afbeelding  van Sentinel-2 - zorg "
 "er voor de uitlijning te controleren (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
-msgstr "imagico.de OSM images for mapping: Panama Canal"
+msgid "imagico.de: Panama Canal"
+msgstr "imagico.de: Panama Canal"
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 "Afbeeldingen van de nieuwe sluizen (maar gedeeltelijk bewolkt) (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
-msgstr "imagico.de OSM images for mapping: Vanatinai"
+msgid "imagico.de: Vanatinai"
+msgstr "imagico.de: Vanatinai"
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 "Ruwe kustlijn vanwege de wolkenbedekking in Bing/Mapbox (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: New Ireland"
-msgstr "imagico.de OSM images for mapping: New Ireland"
+msgid "imagico.de: New Ireland"
+msgstr "imagico.de: New Ireland"
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 "Veel ontbrekende eilanden in OSM (de meeste zij  ondertussen in kaart "
 "gebracht) (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Coropuna"
-msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Coropuna"
+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 "Slechte en verouderde afbeeldingen in andere bronnen (ware kleuren)"
@@ -27072,7 +27160,7 @@ msgid "Geoportal 2: ISOK hillshade"
 msgstr "Geoportal 2: ISOK hillshade"
 
 msgid "polska.e-mapa.net: Buildings"
-msgstr ""
+msgstr "polska.e-mapa.net: Gebouwen"
 
 msgid "Będzin: Orthophotomap 2013 (aerial image)"
 msgstr "Będzin: Orthophotomap 2013 (luchtfoto)"
@@ -27119,8 +27207,11 @@ msgstr "Katowice: Gebouwen"
 msgid "Łódź: Buildings"
 msgstr "Łódź: Gebouwen"
 
-msgid "Łódź: Orthophotomap (aerial image)"
-msgstr "Łódź: Orthophotomap (luchtfoto)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr "Łódź: Orthophotomap 2015 (luchtfoto)"
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
+msgstr "Łódź: Orthophotomap 2017 (luchtfoto)"
 
 msgid "Powiat dębicki: Buildings"
 msgstr "Powiat dębicki: Gebouwen"
@@ -27152,6 +27243,12 @@ msgstr "Powiat stalowowolski: Gebouwen"
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr "Poznań: Orthophotomap 2014 (luchtfoto)"
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr "Poznań: Orthophotomap 2016 (luchtfoto)"
+
+msgid "Poznań: Buildings"
+msgstr "Poznań: Gebouwen"
+
 msgid "Przemyśl: Buildings"
 msgstr "Przemyśl: Gebouwen"
 
@@ -27189,10 +27286,10 @@ msgid "Wrocław: Orthophotomap 2015 (aerial image)"
 msgstr "Wrocław: Orthophotomap 2015 (luchtfoto)"
 
 msgid "Ortofotos DGRF 2004-2006 (WMS)"
-msgstr ""
+msgstr "Ortofotos DGRF 2004-2006 (WMS)"
 
 msgid "Ortofotos Litoral DGT 2014-2015 (WMS)"
-msgstr ""
+msgstr "Ortofotos Litoral DGT 2014-2015 (WMS)"
 
 msgid "ScanEx IRS"
 msgstr "ScanEx IRS"
@@ -27200,43 +27297,36 @@ msgstr "ScanEx IRS"
 msgid "ScanEx SPOT"
 msgstr "ScanEx SPOT"
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
-msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Kerch Strait"
+msgid "imagico.de: Kerch Strait"
+msgstr "imagico.de: Kerch Strait"
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr ""
 "Status van de constructie van de brug in augustus 2016 (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Pechora Sea Coast"
+msgid "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-afbeelding van de Pechora Sea-kust in herfst 2016 (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: Ushakov Island August 2016"
+msgid "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  afbeeldingen uit de late zomer met weinig bewolking (ware "
 "kleuren)"
 
-msgid "imagico.de OSM images for mapping: Northern Dvina delta at low tide"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: Northern Dvina delta bij "
-"laagtij"
+msgid "imagico.de: Northern Dvina delta at low tide"
+msgstr "imagico.de: Northern Dvina delta bij laagtij"
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr "Stranden, getijdeplaten en andere kustvormen (ware kleuren)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: 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 "
@@ -27245,9 +27335,8 @@ msgstr ""
 "Up-to-date  afbeeldingen uit de late zomer met weinig bewolking - let op: "
 "niet alle zichtbare sneeuw zijn gletsjers (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: Vostochny Cosmodrome"
+msgid "imagico.de: Vostochny Cosmodrome"
+msgstr "imagico.de: Vostochny Cosmodrome"
 
 msgid "Recent image showing newest features (true color)"
 msgstr "Recente afbeelding die de nieuwste onjecten weergeeft (ware kleuren)"
@@ -27296,27 +27385,27 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "Zuid-Afrika CD:NGI Luchtfoto"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
-msgstr "imagico.de OSM images for mapping: Leskov Island ASTER"
+msgid "imagico.de: Leskov Island ASTER"
+msgstr "imagico.de: Leskov Island ASTER"
 
 msgid "Missing in other image sources (true color with estimated blue)"
 msgstr ""
 "Ontbreekt in andere afbeeldingsbronnen (ware kleuren met geschat blauw)"
 
-msgid "imagico.de OSM images for mapping: Scott Island"
-msgstr "imagico.de OSM images for mapping: Scott Island"
+msgid "imagico.de: Scott Island"
+msgstr "imagico.de: Scott Island"
 
 msgid "Missing in other image sources (true color)"
 msgstr "Ontbreekt in andere afbeeldingsbronnen (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
-msgstr "imagico.de OSM images for mapping: Leskov Island Landsat"
+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 Spanje"
@@ -27339,18 +27428,18 @@ msgstr "IDEIB - Balearen"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Canarische eilanden"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
-msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
+msgstr "imagico.de: Adams Bridge"
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr ""
 "Aanvullend aan onvolledige bedekking in andere bronnen (ware kleuren)"
 
 msgid "Economic Maps (historic)"
-msgstr ""
+msgstr "Economische kaarten (historisch)"
 
 msgid "Scan of ´Economic maps´ ca 1950-1980"
-msgstr ""
+msgstr "Scan van ´Economic maps´ ca 1950-1980"
 
 msgid "Snowmobile map Sweden"
 msgstr "Sneeuwmobielkaart Zweden"
@@ -27436,10 +27525,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-afbeeldingen voor in kaart brengen: Cental Alps in late "
-"September 2016"
 
 msgid ""
 "Up-to-date image for glacier mapping - beware of some fresh snow at higher "
@@ -27448,6 +27535,13 @@ msgstr ""
 "Up-to-date-afbeelding voor in kaart brengen van gletsjer - let op enige "
 "verse sneeuw op hogere hoogten (ware kleuren)"
 
+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"
 
@@ -27466,9 +27560,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-afbeeldingen voor in kaart brengen: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
+msgstr "imagico.de: Mount Kilimanjaro 2016"
 
 msgid "Aşgabat (high resolution)"
 msgstr "Aşgabat (hoge resolutie)"
@@ -27540,8 +27633,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 "
@@ -27550,14 +27643,14 @@ msgstr ""
 "Recente afbeelding uit de zomer van de Alaska Range voor het in kaart "
 "brengen van natuurlijke objecten (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
-msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Bogoslof Island"
+msgid "imagico.de: Bogoslof Island"
+msgstr "imagico.de: Bogoslof Island"
 
 msgid "Recent image from after the eruption (true color)"
 msgstr "Recente afbeelding van na de uitbarsting (ware kleuren)"
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
-msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Cook Inlet"
+msgid "imagico.de: Cook Inlet"
+msgstr "imagico.de: Cook Inlet"
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
 msgstr "Getijdeplaten en gletsjers in omliggende bergen (ware kleuren)"
@@ -27658,8 +27751,16 @@ msgstr ""
 "foot), 4-band ware kleuren en bijna infrarood (R, G, B, IR) luchtfoto’s die "
 "Counties New Castle, Kent en Sussex in Delaware bedekken."
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
-msgstr "imagico.de OSM images for mapping: Rwenzori Mountains"
+msgid "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 resolutie"
+
+msgid "imagico.de: Rwenzori Mountains"
+msgstr "imagico.de: Rwenzori Mountains"
 
 msgid ""
 "Recent image of most of the remaining Rwenzori Mountains glaciers (false "
@@ -27668,9 +27769,8 @@ msgstr ""
 "Recente afbeelding van de de meest van de resterende gletsjers van de "
 "Rwenzori Mountains (valse kleuren IR)"
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
-msgstr ""
-"imagico.de OSM-afbeeldingen voor in kaart brengen: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
+msgstr "imagico.de: Rwenzori Mountains 2016"
 
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Oekraïne - Orthophotomaps 2012"
@@ -27684,6 +27784,12 @@ msgstr "Oekraïne - Kiev 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"
 
@@ -28873,52 +28979,45 @@ msgid "{0} should have numbers only with optional .5 increments"
 msgstr ""
 "{0} zou getallen alleen moeten hebben met optionele verhogingen van .5"
 
+msgid "unusual value of {0}: use . instead of , as decimal separator"
+msgstr ""
+"ongebruikelijke waarde van {0}: gebruik . in plaats van , als decimaal "
+"scheidingsteken"
+
 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}: meters is standaard; punt is scheidingsteken; indien eenheden, plaats "
-"een spatie dan de eenheid"
+"ongebruikelijke waarde van {0}: meters is standaard; punt is decimaal "
+"scheidingsteken; indien eenheden, plaats spatie dan eenheid"
 
 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}: ton is standaard; punt is scheidingsteken; indien eenheden, plaats "
-"spatie, dan eenheid"
+"ongebruikelijke waarde van {0}: ton is standaard; punt is decimaal "
+"scheidingsteken; indien eenheden, plaats spatie dan eenheid"
 
-msgid "unusual {0} format"
-msgstr "ongebruikelijke indeling {0}"
+msgid "unusual value of {0}"
+msgstr "ongebruikelijke waarde van {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}: kilometer is standaard; punt is scheidingsteken; indien eenheden, "
-"plaats spatie, dan eenheid"
+"ongebruikelijke waarde van {0}: kilometers is standaard; punt is decimaal "
+"scheidingsteken; indien eenheden, plaats spatie dan eenheid"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 "voltage zou in volts moeten zijn zonder eenheden/scheidingsteken/spaties"
 
-msgid "unusual {0} specification"
-msgstr "ongebruikelijke specificatie {0}"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "ongebruikelijke spoorbreedte; gebruik mm zonder scheidngsteken"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr ""
-"ongebruikelijke stijging; gebruik percentage/graden of naar boven/naar "
-"beneden"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} moet een numerieke waarde zijn"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} moet een positief geheel getal zijn"
 
-msgid "unusual value of {0}"
-msgstr "ongebruikelijke waarde van {0}"
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr "{0} moet een numerieke waarde zijn, in meters en zonder eenheden"
 
@@ -29041,6 +29140,9 @@ msgid "Less obtrusive node symbols at low zoom"
 msgstr ""
 "Minder nadrukkelijk aanwezige symbolen voor knopen bij laag zoomniveau"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Straatlabels weergeven (op hoog zoomniveau)"
 
@@ -29102,6 +29204,9 @@ msgstr ""
 "Wijst automatisch het adres toe aan een geselecteerd object in Oostenrijk. "
 "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."
@@ -29150,6 +29255,9 @@ msgstr ""
 "Implementeert een opdrachtregel end maakt het u mogelijk uw opdrachten te "
 "maken. Zie koppeling voor standaard opdrachten (boog, cirkel etc.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 "programma voor samenvoegen van gegevens (overeenkomsten en samenvoegen)."
@@ -29209,6 +29317,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Afhandeling van Franse EPCI''s (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Externe scripts gebruiken in JOSM"
 
@@ -29435,6 +29548,9 @@ msgstr ""
 "Maakt het mogelijk GPX/OSM-bestanden te openen die het momenteel zichtbare "
 "schermgebied kruisen"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -30330,586 +30446,6 @@ msgstr "afbeelding met geo-verwijzing importeren"
 msgid "Error while creating image layer: "
 msgstr "Fout bij maken van afbeeldingslaag: "
 
-msgid "Mapillary Images"
-msgstr "Afbeeldingen van Mapillary"
-
-msgid "Mapillary layer"
-msgstr "laag van Mapillary"
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr "{0} reeksen, elk tussen {1} en {2} afbeeldingen bevattend (ø {3})"
-
-msgid "{0} imported images"
-msgstr "{0} geïmporteerde afbeeldingen"
-
-msgid "{0} downloaded images"
-msgstr "{0} gedownloade afbeeldingen"
-
-msgid "{0} images in total"
-msgstr "{0} totaal aantal afbeeldingen"
-
-msgid "{0} images in {1} sequences"
-msgstr "{0} afbeeldingen in {1} reeksen"
-
-msgid "Mapillary object layer"
-msgstr "Mapillary objectenlaag"
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-"Geeft de laag weer die de kaartobjecten weergeeft die zijn gedetecteerd door "
-"Mapillary"
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Download Mapillary images in current view"
-msgstr "Afbeeldingen van Mapillary in huidige weergave downloaden"
-
-msgid "Export pictures"
-msgstr "Afbeeldingen exporteren"
-
-msgid "Export Mapillary pictures"
-msgstr "Afbeeldingen van Mapillary exporteren"
-
-msgid "Export images"
-msgstr "Afbeeldingen exporteren"
-
-msgid "Import pictures"
-msgstr "Afbeeldingen importeren"
-
-msgid "Import local pictures"
-msgstr "Lokale afbeeldingen importeren"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Afbeeldingen naar laag van Mapillary importeren"
-
-msgid "Join mode"
-msgstr "Modus Samenvoegen"
-
-msgid "Join/unjoin pictures"
-msgstr "Afbeeldingen samenvoegen/van elkaar losmaken"
-
-msgid "Submit changeset"
-msgstr "Wijzigingenset indienen"
-
-msgid "Submit the current changeset"
-msgstr "De huidige wijzigingenset indienen"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "De huidige wijzigingenset naar Mapillary indienen"
-
-msgid "rejected"
-msgstr "afgewezen"
-
-msgid "pending"
-msgstr "afwachtend"
-
-msgid "approved"
-msgstr "goedgekeurd"
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr "{0} afbeeldingen ingediend, Sleutel wijzigingenset: {1}, Status: {2}"
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr "Uploaden van wijzigingenset mislukt met {0} fout ''{1} {2}''!"
-
-msgid ""
-"An exception occured while trying to submit a changeset. If this happens "
-"repeatedly, consider reporting a bug via the Help menu. If this message "
-"appears for the first time, simply try it again. This might have been an "
-"issue with the internet connection."
-msgstr ""
-"er trad een uitzondering op tijdens het indienen van de wijzigingenset. Als "
-"dit vaker voorkomt, overweeg dan om een bug te rapporteren via het menu "
-"Help. Als dit bericht voor de eerste keer verschijnt, probeer het dan gewoon "
-"nog een keer. Dit zou een probleempje met de internetverbinding geweest "
-"kunnen zijn."
-
-msgid "Upload Mapillary images"
-msgstr "Afbeeldingen van Mapillary uploaden"
-
-msgid "Walk mode"
-msgstr "Modus Wandeling"
-
-msgid "Zoom to selected image"
-msgstr "Zoom naar geselecteerde afbeelding"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Zoom naar huidige geselecteerde afbeelding van Mapillary"
-
-msgid "Current Mapillary changeset"
-msgstr "Huidige wijzigingenset voor Mapillary"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Dialoogvenster voor wijzigingenset Mapillary openen"
-
-msgid "Mapillary changeset"
-msgstr "Mapillary wijzigingenset"
-
-msgid "Submitting changeset to server…"
-msgstr "Wijzigingenset indienen bij de server…"
-
-msgid "Export all images"
-msgstr "Alle afbeeldingen exporteren"
-
-msgid "Export selected sequence"
-msgstr "Geselecteerde reeks exporteren"
-
-msgid "Export selected images"
-msgstr "Geselecteerde afbeeldingen exporteren"
-
-msgid "Rewrite imported images"
-msgstr "Geïmporteerde afbeeldingen opnieuw schrijven"
-
-msgid "Select a directory"
-msgstr "Selecteer een map"
-
-msgid "Explore"
-msgstr "Verkennen"
-
-msgid "Speed limit"
-msgstr "Maximum snelheid"
-
-msgid "Give way"
-msgstr "Voorrang verlenen"
-
-msgid "No entry"
-msgstr "Niet inrijden"
-
-msgid "Intersection danger"
-msgstr "Gevaar: kruising"
-
-msgid "Mandatory direction (any)"
-msgstr "Verplichte rijrivchting (altijd)"
-
-msgid "Uneven road"
-msgstr "Oneven weg"
-
-msgid "No parking"
-msgstr "Niet parkeren"
-
-msgid "No overtaking"
-msgstr "Niet inhalen"
-
-msgid "Pedestrian crossing"
-msgstr "Voetgangersoversteekplaats"
-
-msgid "No turn"
-msgstr "Niet keren"
-
-msgid "Years"
-msgstr "Jaren"
-
-msgid "Months"
-msgstr "Maanden"
-
-msgid "Days"
-msgstr "Dagen"
-
-msgid "Imported images"
-msgstr "Geïmporteerde afbeeldingen"
-
-msgid "Mapillary filter"
-msgstr "filter voor Mapillary"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Dialoogvenster voor filter van Mapillary openen"
-
-msgid "Not older than: "
-msgstr "Niet ouder dan: "
-
-msgid "Downloaded images"
-msgstr "Gedownloade afbeeldingen"
-
-msgid "Only images with signs"
-msgstr "Alleen afbeeldingen met tekens"
-
-msgid "Choose signs"
-msgstr "Tekens kiezen"
-
-msgid "Mapillary history"
-msgstr "Geschiedenis Mapillary"
-
-msgid "Open Mapillary history dialog"
-msgstr "Dialoogvenster Geschiedenis van Mapillary openen"
-
-msgid "No image selected"
-msgstr "Geen afbeelding geselecteerd"
-
-msgid "Press \"{0}\" to download images"
-msgstr "Druk op \"{0}\" om afbeeldingen te downloaden"
-
-msgid "Mapillary picture"
-msgstr "afbeelding van Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Venster van Mapillary openen"
-
-msgid "Next picture"
-msgstr "Volgende afbeelding"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Geeft de volgende afbeelding in de reeks weer"
-
-msgid "Previous picture"
-msgstr "Vorige afbeelding"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Geeft de vorige afbeelding in de reeks weer"
-
-msgid "Jump to red"
-msgstr "Spring naar rood"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Springt naar de afbeelding aan de andere zijde van de rode lijn"
-
-msgid "Jump to blue"
-msgstr "Spring naar blauw"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Springt naar de afbeelding aan de andere zijde van de blauwe lijn"
-
-msgid "Stops the walk."
-msgstr "Stopt de wandeling"
-
-msgid "Play"
-msgstr "Afspelen"
-
-msgid "Continues with the paused walk."
-msgstr "Doorgaan met onderbroken wandeling"
-
-msgid "Pause"
-msgstr "Pauze"
-
-msgid "Pauses the walk."
-msgstr "Onderbreekt de wandeling"
-
-msgid "Display hour when the picture was taken"
-msgstr "Uur weergeven van wanneer de afbeelding werd gemaakt"
-
-msgid "Use 24 hour format"
-msgstr "24-uursindeling gebruiken"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-"Naar locatie van afbeeldingen verplaatsen met knoppen Volgende/Vorige"
-
-msgid "Preview images when hovering its icon"
-msgstr "Voorbeeld van afbeeldingen bij bevinden boven pictogram"
-
-msgid "Cut off sequences at download bounds"
-msgstr "Snijd reeksen af op de randen van de download"
-
-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 "Experimentele bèta-mogelijkheden inschakelen (kunnen onstabiel zijn)"
-
-msgid "Download mode"
-msgstr "Modus Downloaden"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-"Aantal afbeeldingen om vooraf op te halen (voorwaarts en achterwaarts)"
-
-msgid "You are logged in as ''{0}''."
-msgstr "U bent aangemeld als ''{0}''."
-
-msgid "You are currently not logged in."
-msgstr "U bent momenteel niet ingelogd."
-
-msgid "Login"
-msgstr "Inloggen"
-
-msgid "Logout"
-msgstr "Uitloggen"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr "Ga naar Instellingen en log in bij Mapillary vóór uploaden."
-
-msgid "Upload selected sequence"
-msgstr "Geselecteerde reeks uploaden"
-
-msgid "Delete after upload"
-msgstr "Na uploaden verwijderen"
-
-msgid "Wait for full quality pictures"
-msgstr "Wachten op afbeeldingen met goede kwaliteit"
-
-msgid "Follow selected image"
-msgstr "Geselecteerde afbeelding volgen"
-
-msgid "Go forward"
-msgstr "Naar voren gaan"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr "Welke afbeeldingslagen wilt u importeren in de laag van Mapillary?"
-
-msgid "Import"
-msgstr "Importeren"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-"Kon geen afbeelding met geoverwijzingen importeren in de laag van Mapillary!"
-
-msgid "{0} ({1} images)"
-msgstr "{0} ({1} afbeeldingen)"
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-"Vanuit welke bron wilt u afbeeldingen importeren naar de laag van Mapillary?"
-
-msgid "There are currently no layers with geotagged images!"
-msgstr "Er zijn momenteel geen lagen met afbeeldingen met geoverwijzingen!"
-
-msgid "Images from my file system"
-msgstr "Afbeeldingen vanaf mijn bestandssysteem"
-
-msgid "Select the images you want to import"
-msgstr "Selecteer de afbeeldingen die u wilt importeren"
-
-msgid "All images in a directory"
-msgstr "Alle afbeeldingen in een map"
-
-msgid "Select directory to import images from"
-msgstr "Selecteer de map van waaruit u de afbeeldingen wilt importeren"
-
-msgid "From existing image layer"
-msgstr "Uit bestaande afbeeldingslaag"
-
-msgid "Import exception"
-msgstr "Uitzondering bij importeren"
-
-msgid "Could not import the image ''{0}''!"
-msgstr "Kon de afbeelding ''{0}'' niet importeren!"
-
-msgid "Could not import the directory ''{0}''!"
-msgstr "Kon de map ''{0}'' niet importeren!"
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-"Een tag met de sleutel <i>{0}</i> is al aanwezig op het geselecteerde object "
-"van OSM."
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-"Wilt u echt de huidige waarde <i>{0}</i> vervangen door de nieuwe waarde "
-"<i>{1}</i>?"
-
-msgid "Tag conflict"
-msgstr "Tagconflict"
-
-msgid "Key copied to clipboard"
-msgstr "Sleutel gekopieerd naar klembord"
-
-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 ""
-"De plug-in Mapillary gebruikt nu een afzonderlijk paneel om extra informatie "
-"weer te geven (zoals de sleutel van de afbeelding) en acties voor de "
-"momenteel geselecteerde afbeelding in Mapillary (zoals die bekijken in een "
-"browser)."
-
-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 ""
-"Het kan worden geactiveerd door te klikken op de linker knop aan de "
-"onderzijde van dit bericht of de knop links in de werkbalk, die hetzelfde "
-"pictogram gebruikt."
-
-msgid "I got it, close this."
-msgstr "Ik snap het, sluit dit venster."
-
-msgid "Image info"
-msgstr "Informatie over afbeelding"
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-"Geeft gedetailleerde informatie weer over de momenteel geselecteerde "
-"afbeelding in Mapillary"
-
-msgid "Show detections on top of image"
-msgstr "Detecties bovenop afbeelding weergeven"
-
-msgid "View in browser"
-msgstr "Weergeven in browser"
-
-msgid "Copy key"
-msgstr "Sleutel kopiëren"
-
-msgid "Add Mapillary tag"
-msgstr "Tag voor Mapillary toevoegen"
-
-msgid "Image detections"
-msgstr "Detecties in afbeelding"
-
-msgid "Image actions"
-msgstr "Acties voor afbeelding"
-
-msgid "Image key"
-msgstr "Sleutel voor afbeelding"
-
-msgid "Sequence key"
-msgstr "Sleutel voor reeks"
-
-msgid "{0} detections"
-msgstr "{0} detecties"
-
-msgid "image has no key"
-msgstr "afbeelding heeft geen sleutel"
-
-msgid "unknown user"
-msgstr "onbekende gebruiker"
-
-msgid "sequence has no key"
-msgstr "reeks heeft geen sleutel"
-
-msgid "Could not open the URL {0} in a browser"
-msgstr "Kon de URL {0} niet openen in een browser"
-
-msgid "Downloading map objects…"
-msgstr "Kaartobjecten downloaden…"
-
-msgid "All map objects loaded."
-msgstr "Alle kaartobjecten geladen."
-
-msgid "Too many map objects, zoom in to see all."
-msgstr "Teveel kaartobjecten, zoom in om ze allemaal te zien."
-
-msgid "Downloading map objects failed!"
-msgstr "Downloaden van kaartobjecten is mislukt!"
-
-msgid "Mapillary objects"
-msgstr "Objecten van Mapillary"
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-"Laat objecten zien die zijn gedetecteerd door Mapillary vanuit hun "
-"straatweergaven"
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] "{0} afbeelding verwijderd"
-msgstr[1] "{0} afbeeldingen verwijderd"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "{0} afbeelding geïmporteerd"
-msgstr[1] "{0} afbeeldingen geïmporteerd"
-
-msgid "2 images joined"
-msgstr "2 afbeeldingen samengevoegd"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "{0} afbeelding verplaatst"
-msgstr[1] "{0} afbeeldingen verplaatst"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "{0} afbeelding gedraaid"
-msgstr[1] "{0} afbeeldingen gedraaid"
-
-msgid "2 images unjoined"
-msgstr "2 afbeeldingen van elkaar losgemaakt"
-
-msgid "Could not read from URL {0}!"
-msgstr "Kon niet lezen vanuit de URL {0}!"
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-"{0}\n"
-"Kon geen kaartobjecten lezen vanuit URL\n"
-"{1}!"
-
-msgid "everything in the visible area"
-msgstr "alles in het zichtbare gebied"
-
-msgid "areas with downloaded OSM-data"
-msgstr "gebieden met gedownloade gegevens van OSM"
-
-msgid "only when manually requested"
-msgstr "alleen indien handmatig verzocht"
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-"De laag van Mapillary is gestopt met downloaden va afbeeldingen omdat het "
-"gevraagde gebied te groot is!"
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-"U zou in kunnen zoomen en een kleiner gedeelte van de kaart kunnen laden om "
-"dit probleem op te lossen."
-
-msgid ""
-"To solve this problem, you could switch to download mode ''{0}'' and load "
-"Mapillary images for a smaller portion of the map."
-msgstr ""
-"U zou kunnen schakelen naar de modus Downloaden ''{0}'' en afbeeldingen van "
-"Mapillary kunnen laden voor een kleiner gedeelte van de kaart om dit "
-"probleem op te lossen."
-
-msgid "Downloading"
-msgstr "Downloaden"
-
-msgid "Select mode"
-msgstr "Modus Selectie"
-
-msgid "Mapillary login"
-msgstr "Log-in voor Mapillary"
-
-msgid "Login successful, return to JOSM."
-msgstr "Log-in succesvol, terug naar JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Ondersteunde indelingen voor afbeeldingen (JPG en PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "Afbeeldingen van Mapillary downloaden"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Totaal aantal afbeeldingen van Mapillary: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr "Wijzigingenset voor Mapillary indienen"
-
-msgid "No images found"
-msgstr "Geen afbeeldingen gevonden"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr "U heeft met succes {0} afbeeldingen naar mapillary.com geüpload"
-
-msgid "Finished upload"
-msgstr "Uploaden voltooid"
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr "U bent niet ingelogd, log in bij Mapillary in de Voorkeuren"
-
-msgid "Not Logged in to Mapillary"
-msgstr "Niet ingelogd bij Mapillary"
-
-msgid "Uploading: {0}"
-msgstr "Uploaden: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -31746,6 +31282,114 @@ msgstr "Voor dit object werd geen adres gevonden."
 msgid "An unexpected exception occurred:"
 msgstr "Er trad een onverwachte fout op:"
 
+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 ""
+"Dit gereedschap kan alleen een knoop door een knoop vervangen, een knoop "
+"opwaarderen naar een weg of een multipolygoon, of een weg vervangen door een "
+"weg."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "Knoop behoort tot weg(en), kan niet vervangen."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+"Relatie is geen multipolygoon, kan niet worden gebruikt als een vervanging."
+
+msgid "Replace geometry for node {0}"
+msgstr "Vervang geometrie door knoop {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Selecteer één weg die bestaat in de database en één nieuwe weg met de juiste "
+"geometrie."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "De wegen moeten geheel binnen het gedownloade gebied liggen."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"De weg die moet worden vervangen mag geen knopen hebben met eigenschappen of "
+"lidmaatschappen van relaties tenzij zij behoren tot beide wegen."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"De grens van het aantal stappen voor de robuuste methode is overschreden, "
+"gebruik een eenvoudiger methode."
+
+msgid "Replace geometry for way {0}"
+msgstr "Vervang geometrie voor weg {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Er zijn teveel wegen toegevoegd: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr "Veralgemeniseren van gebouwen"
 
@@ -31782,9 +31426,30 @@ msgstr "Tags voor gebouwen:"
 msgid "Cannot place building outside of the world."
 msgstr "Kan geen gebouw buiten de wereld plaatsen."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Gebouw maken"
 
+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 "Grootte gebouw instellen"
 
@@ -31797,8 +31462,17 @@ msgstr "Gebouw automatisch selecteren"
 msgid "Use address nodes under buildings"
 msgstr "Gebruik adresknopen onder gebouwen"
 
-msgid "Buildings width:"
-msgstr "Breedte gebouw:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Lengte stap:"
@@ -32564,6 +32238,18 @@ msgstr "Verwijder het geselecteerde schema uit de lijst."
 msgid "Color Schemes"
 msgstr "Kleurenschema''s"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Afbreken van bewerken van tags en sluit het dialoogvenster"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Pas de bewerkte tags toe en sluit het dialoogvenster"
+
 msgid "Conflation"
 msgstr "Samenvoeging"
 
@@ -33089,6 +32775,9 @@ msgstr "Open paneel voor GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Zoom in om berichten te zien"
 
+msgid "Login"
+msgstr "Inloggen"
+
 msgid "Enable autologin"
 msgstr "Automatisch inloggen inschakelen"
 
@@ -33121,24 +32810,15 @@ msgstr "Privé chatten"
 msgid "Close tab"
 msgstr "Tabblad sluiten"
 
+msgid "Logout"
+msgstr "Uitloggen"
+
 msgid "Clear log"
 msgstr "Log wissen"
 
 msgid "Show users on map"
 msgstr "Gebruikers op kaart weergeven"
 
-msgid "GeoJSON file"
-msgstr "GeoJSON-bestand"
-
-msgid "Loading json file..."
-msgstr "JSON-bestand laden..."
-
-msgid "Data Layer from GeoJSON: "
-msgstr "Gegevenslaag van GeoJSON: "
-
-msgid "Error loading geojson file {0}"
-msgstr "Fout bij laden van GeoJSON-bestand {0}"
-
 msgid "Position only"
 msgstr "Alleen positie"
 
@@ -33229,6 +32909,9 @@ msgstr "Globalsat importeren"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Gegevens van Globalsat Datalogger DG100 in GPX-laag importeren."
 
+msgid "Import"
+msgstr "Importeren"
+
 msgid "GPS Blams"
 msgstr "GPS Blams"
 
@@ -33987,8 +33670,27 @@ msgstr "Type structuur:"
 msgid "Offset into background:"
 msgstr "Verschuiving op achtergrond:"
 
-msgid "Indoor Mapping Helper"
-msgstr "Hulpprogramma Indoor mappen"
+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 ""
+"Geen relatie of geen lid van een relatie met de rol \"outer\" geselecteerd."
 
 msgid "POWER"
 msgstr "POWER"
@@ -34020,36 +33722,105 @@ msgstr "Stelt de tag ref in als het object room werd geselecteerd."
 msgid "Apply Tags"
 msgstr "Tags toepassen"
 
-msgid "Fitting"
-msgstr "Passen"
+msgid "Add a new level"
+msgstr "Een nieuw niveau toevoegen"
 
 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>Onthoud om uw bouwplannen nu in te passen.<br>Gebruik, om dat te doen, "
-"de plug-in PicLayer, die u kunt installeren<br>met behulp van Plug-ins "
-"beheren in JOSM.</html>"
-
-msgid "Level Selection"
-msgstr "Selectie van niveau"
+"<html> Voer het nieuwe nummer in voor het niveau dat u wilt toevoegen.<br>  "
+"<i>Info</i>: <br> Als de knop OK wordt ingedrukt schakelt u over naar de "
+"actie om te tekenen.<br>Druk op de spatiebalk om het nieuwe object te "
+"voltooien. Het nieuwe niveau<br>zal automatisch worden getagd. </html>"
 
-msgid "Lowest Level"
-msgstr "Laagste niveau"
+msgid "level number:"
+msgstr "niveaunummer:"
 
-msgid "The lowest level of your building."
-msgstr "Het laagste niveau van uw gebouw."
+msgid "Example: ''2'' or ''3''"
+msgstr "Voorbeeld: ''2'' of ''3''"
 
-msgid "Highest Level"
-msgstr "Hoogste niveau"
-
-msgid "The highest level of your building."
-msgstr "Het hoogste niveau van uw gebouw."
+msgid "Indoor Mapping Helper"
+msgstr "Hulpprogramma Indoor mappen"
 
 msgid "Toolbox for indoor mapping assistance"
 msgstr "Gereedschap voor hulp bij in kaart brengen binnen gebouwen"
 
+msgid "Insert level"
+msgstr "Niveau invoegen"
+
+msgid "Add a new level to layer."
+msgstr "Een nieuw niveau aan de laag toevoegen"
+
+msgid "<html><b>?</strong></b>"
+msgstr "<html><b>?</strong></b>"
+
+msgid "Show Help-Browser."
+msgstr "Help-browser weergeven."
+
+msgid "Level name"
+msgstr "Naam niveau"
+
+msgid "Sets optional name tag for a level."
+msgstr "Stelt optionele tag name voor een niveau in."
+
+msgid "Working level: NONE"
+msgstr "Werkniveau: GEEN"
+
+msgid "Shows the current working level."
+msgstr "Geeft het huidige werkniveau weer."
+
+msgid "Deactivate automatic level tagging."
+msgstr "Automatisch taggen niveau uitschakelen"
+
+msgid "Sets the name tag."
+msgstr "Stelt de tag name in."
+
+msgid "Sets the referance tag."
+msgstr "Stelt de tag reference in."
+
+msgid "Repeat on"
+msgstr "Herhalen op"
+
+msgid ""
+"Sets the repeat on tag when highway objects are selected. Please tag like "
+"this: -3-4 or -2--3 or 5-6 ."
+msgstr ""
+"Stelt de tag repeat on in als objecten highway zijn geselecteerd. Tag als "
+"volgt: -3-4 of -2--3 of 5-6 ."
+
+msgid "OUTER"
+msgstr "OUTER"
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+"Creation-Tool voor multipolygoon met rol: outer. Druk op de spatiebalk om te "
+"voltooien."
+
+msgid "INNER"
+msgstr "INNER"
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+"Creation-Tool voor multipolygonen met rol: inner. Druk op spatiebalk om te "
+"voltooien. Selecteer \"outer\" en druk op Enter om aan de relatie toe te "
+"voegen."
+
+msgid "Deactivate multipolygon function."
+msgstr "Functie Multipolygoon uitschakelen."
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr "Geselecteerde tags en/of relaties aan object toevoegen."
+
+msgid "Working level: {0}"
+msgstr "Werkniveau: {0}"
+
 msgid "InfoMode"
 msgstr "InfoMode"
 
@@ -35228,6 +34999,27 @@ msgstr "Onbekende bestandsextensie: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Ontleden van bestand \"{0}\" mislukt"
 
+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"
 
@@ -35509,6 +35301,8 @@ msgstr "Niet mogelijk bestand ''{0}'' te verwerken:"
 msgid ""
 "Writing position information to image files... Estimated time left: {0}"
 msgstr ""
+"Informatie over positie schrijven naar bestanden van afbeeldingen... "
+"Geschatte resterende tijd: {0}"
 
 msgid "File could not be deleted!"
 msgstr "Bestand kon niet worden verwijderd!"
@@ -35569,6 +35363,9 @@ msgstr "GPS-gegevens van foto bewerken"
 msgid "Please select an image first."
 msgstr "Selecteer eerst een afbeelding."
 
+msgid "No image selected"
+msgstr "Geen afbeelding geselecteerd"
+
 msgid "(Empty values delete the according fields.)"
 msgstr "(Lege waarden verwijderen de overeenkomende velden)"
 
@@ -36348,6 +36145,9 @@ msgstr "impliciet"
 msgid "State"
 msgstr "Staat"
 
+msgid "pending"
+msgstr "afwachtend"
+
 msgid "[incomplete]"
 msgstr "[incompleet]"
 
@@ -36772,12 +36572,6 @@ msgstr "Nieuwe waarde voor {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr "Voorkeur ''{0}'' ontbreekt. Kan SdsApi niet initialiseren."
 
-msgid "Failed to open connection to API {0}."
-msgstr "Openen van verbinding met {0} mislukt."
-
-msgid "Proxy Authentication Required"
-msgstr "Proxy-authenticatie vereist"
-
 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>"
@@ -37145,12 +36939,6 @@ msgstr "JOSM plug-in Tag bewerken"
 msgid "Presets"
 msgstr "Voorkeuze"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Afbreken van bewerken van tags en sluit het dialoogvenster"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Pas de bewerkte tags toe en sluit het dialoogvenster"
-
 msgid "Highlight"
 msgstr "Markeren"
 
@@ -38909,49 +38697,6 @@ msgstr ""
 "Dit gereedschap vervangt de geometrie van één object door een ander en "
 "vereist dus dat exact twee objecten zijn geselecteerd."
 
-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 ""
-"Dit gereedschap kan alleen een knoop door een knoop vervangen, een knoop "
-"opwaarderen naar een weg of een multipolygoon, of een weg vervangen door een "
-"weg."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "Knoop behoort tot weg(en), kan niet vervangen."
-
-msgid "Replace geometry for node {0}"
-msgstr "Vervang geometrie door knoop {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-"Relatie is geen multipolygoon, kan niet worden gebruikt als een vervanging."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Selecteer één weg die bestaat in de database en één nieuwe weg met de juiste "
-"geometrie."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "De wegen moeten geheel binnen het gedownloade gebied liggen."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"De weg die moet worden vervangen mag geen knopen hebben met eigenschappen of "
-"lidmaatschappen van relaties tenzij zij behoren tot beide wegen."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"De grens van het aantal stappen voor de robuuste methode is overschreden, "
-"gebruik een eenvoudiger methode."
-
-msgid "Replace geometry for way {0}"
-msgstr "Vervang geometrie voor weg {0}"
-
 msgid "Replace Membership"
 msgstr "Lid vervangen"
 
@@ -39030,9 +38775,6 @@ msgstr "Selecteer de middelste knopen"
 msgid "Please select two nodes connected by way!"
 msgstr "Selecteer twee knopen die zijn verbonden door een weg!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Er zijn teveel wegen toegevoegd: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Alles binnen (wordt getest)"
 
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index a612ac6..1cf0e43 100644
--- a/i18n/po/nn.po
+++ b/i18n/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2009-07-15 12:49+0000\n"
 "Last-Translator: Skippern <Unknown>\n"
 "Language-Team: Norwegian Nynorsk <nn at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:55+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:55+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: nn\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/oc.po b/i18n/po/oc.po
index e4980dc..e1ee551 100644
--- a/i18n/po/oc.po
+++ b/i18n/po/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2012-10-03 22:14+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary at yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:56+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:56+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -953,8 +953,8 @@ msgstr "Picar l’URL de telecargar :"
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
-msgstr "Calc separat"
+msgid "Download as new layer"
+msgstr ""
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Telecargar las donadas dins un calc novèl"
@@ -2251,12 +2251,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"
@@ -8253,9 +8253,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>"
@@ -9708,6 +9705,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12752,9 +12752,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 ""
 
@@ -14447,6 +14444,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 ""
 
@@ -14456,10 +14457,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 ""
@@ -16283,10 +16280,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17772,6 +17765,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17793,6 +17789,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20446,6 +20445,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23517,6 +23522,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 ""
 
@@ -23598,7 +23630,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23613,7 +23645,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 ""
@@ -23621,21 +23653,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 ""
 
@@ -23774,13 +23828,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"
@@ -23813,14 +23867,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 ""
@@ -23886,7 +23940,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)"
@@ -23973,13 +24027,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)"
@@ -24147,34 +24201,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 ""
@@ -24182,7 +24235,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)"
@@ -24230,7 +24283,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24238,7 +24291,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 ""
@@ -24407,8 +24460,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 ""
@@ -24416,9 +24468,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 ""
@@ -24426,10 +24476,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"
@@ -24462,57 +24512,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 ""
@@ -24520,13 +24565,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 ""
@@ -24594,13 +24639,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 ""
@@ -24608,7 +24653,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24616,7 +24661,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24624,19 +24669,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 ""
@@ -24741,13 +24786,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 ""
@@ -24755,7 +24800,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)"
@@ -24849,13 +24894,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 ""
 
@@ -24943,6 +24981,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 ""
 
@@ -24951,6 +25003,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 ""
 
@@ -24958,13 +25034,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 ""
@@ -24978,7 +25054,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 ""
@@ -24986,29 +25062,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)"
@@ -25077,7 +25152,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"
@@ -25110,6 +25188,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 ""
 
@@ -25158,33 +25242,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 ""
@@ -25192,7 +25274,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)"
@@ -25238,25 +25320,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"
@@ -25280,7 +25362,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)"
@@ -25376,7 +25458,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 ""
@@ -25384,6 +25466,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 ""
 
@@ -25402,7 +25491,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)"
@@ -25464,7 +25553,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 ""
@@ -25472,13 +25561,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)"
@@ -25565,7 +25654,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 ""
@@ -25573,7 +25669,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"
@@ -25588,6 +25684,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26579,32 +26681,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"
@@ -26613,9 +26711,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 ""
 
@@ -26722,6 +26817,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 ""
 
@@ -26765,6 +26863,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."
@@ -26798,6 +26899,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26845,6 +26949,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 ""
 
@@ -27010,6 +27119,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 ""
@@ -27799,550 +27911,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 ""
 
@@ -29037,6 +28605,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 ""
 
@@ -29070,9 +28736,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 ""
 
@@ -29085,7 +28772,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:"
@@ -29764,6 +29460,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 ""
 
@@ -30258,6 +29966,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30290,22 +30001,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"
@@ -30395,6 +30097,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31084,7 +30789,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"
@@ -31117,31 +30840,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"
@@ -32222,6 +32006,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 ""
 
@@ -32555,6 +32360,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33292,6 +33100,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33702,12 +33513,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>"
@@ -34044,12 +33849,6 @@ msgstr ""
 msgid "Presets"
 msgstr "Prereglatges"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35590,39 +35389,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 ""
 
@@ -35696,9 +35462,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/pa.po b/i18n/po/pa.po
index 8279824..9bc720e 100644
--- a/i18n/po/pa.po
+++ b/i18n/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2011-05-06 15:52+0000\n"
 "Last-Translator: A S Alam <alam.yellow at gmail.com>\n"
 "Language-Team: Punjabi <pa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:57+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:57+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: pa\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/pl.po b/i18n/po/pl.po
index aa0b7e1..0611b24 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -8,17 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-15 00:36+0000\n"
-"Last-Translator: eBin <Unknown>\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-27 14:41+0000\n"
+"Last-Translator: Piotr Strębski <strebski at gmail.com>\n"
 "Language-Team: polski <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:57+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:58+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: pl\n"
 
 msgid "Cutting"
@@ -1053,8 +1053,8 @@ msgstr "Proszę wprowadzić adres danych do pobrania:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Wprowadź URL z którego powinny być pobierane dane"
 
-msgid "Separate Layer"
-msgstr "Osobna warstwa"
+msgid "Download as new layer"
+msgstr "Pobranie do nowej warstwy"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Wczytuje dane do nowej warstwy"
@@ -2493,12 +2493,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"
@@ -9010,9 +9010,6 @@ msgstr "Wartości szerokości geograficznej musza być z zakresu [-90,90]."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Wartości długości geograficznej musza być z zakresu [-180,180]."
 
-msgid "Download as new layer"
-msgstr "Pobranie do nowej warstwy"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10703,6 +10700,9 @@ msgstr "Nie znaleziono danych w pliku „{0}”."
 msgid "Open OSM file"
 msgstr "Otwórz plik OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr "Pliki błędów walidatora"
 
@@ -10758,10 +10758,10 @@ msgid "Load tile"
 msgstr "Wczytaj kafelek"
 
 msgid "Get tile status"
-msgstr ""
+msgstr "Uzyskaj stan kafelka"
 
 msgid "Force tile rendering"
-msgstr ""
+msgstr "Wymuś renderowanie kafelka"
 
 msgid "Failed to create tile source"
 msgstr "Nie udało się utworzyć źródła kafelków"
@@ -10884,7 +10884,7 @@ msgid "Length"
 msgstr "Długość"
 
 msgid "Number of<br/>Segments"
-msgstr ""
+msgstr "Liczba<br/>segmentów"
 
 msgid "Length: {0}"
 msgstr "Długość: {0}"
@@ -10909,8 +10909,9 @@ msgstr[2] "{0} śladów"
 
 msgid " ({0} segment)"
 msgid_plural " ({0} segments)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] " ({0} segment)"
+msgstr[1] " ({0} segmenty)"
+msgstr[2] " ({0} segmentów)"
 
 msgid "Save GPX file"
 msgstr "Zapisywanie pliku GPX"
@@ -12201,7 +12202,7 @@ msgstr ""
 "użytkownika OAuth."
 
 msgid "Failed to authorize OAuth request  ''{0}''"
-msgstr "Nie udało się uwierzytelnić żądania OAuth ''{0}''"
+msgstr "Nie udało się uwierzytelnić żądania OAuth „{0}''"
 
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
 msgstr "Uwierzytelniam Żeton Żądania OAuth „{0}” na witrynie OSM..."
@@ -14059,9 +14060,6 @@ msgstr "Zdalne sterowanie"
 msgid "Settings for the remote control feature."
 msgstr "Konfiguruje ustawienia zdalnego sterowania"
 
-msgid "Download objects to new layer"
-msgstr "Pobieranie obiektów do nowej warstwy"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Potwierdzanie ręczne wszystkie czynności zdalnego sterowania"
 
@@ -15582,10 +15580,10 @@ msgid "Do you want to allow this?"
 msgstr "Zezwolić na to?"
 
 msgid "Yes, always"
-msgstr ""
+msgstr "Tak, zawsze"
 
 msgid "Yes, once"
-msgstr ""
+msgstr "Tak, tylko raz"
 
 msgid "Confirm Remote Control action"
 msgstr "Potwierdzanie działań zdalnej kotroli"
@@ -15997,6 +15995,12 @@ msgstr "Zachowaj wtyczkę"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Zachowuje wtyczkę „{0}”"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Nie udało się zainstalować wtyczkę „{0}” z tymczasowego pliku pobierania "
+"„{1}”. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Nie udało się usunąć nieaktualnej wtyczki „{0}”."
 
@@ -16008,12 +16012,6 @@ msgstr ""
 "Program mimo wszystko spróbuje wczytać starą wersję wtyczki."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Nie udało się zainstalować wtyczkę „{0}” z tymczasowego pliku pobierania "
-"„{1}”. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -16494,7 +16492,7 @@ msgstr ""
 "spróbować ponownie później."
 
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr "Serwer OSM ''{0}'' zgłosił błędne żądanie.<br>"
+msgstr "Serwer OSM „{0}” zgłosił błędne żądanie.<br>"
 
 msgid ""
 "The area you tried to download is too big or your request was too "
@@ -16556,7 +16554,7 @@ msgstr ""
 "nagłówka ''Location''. Nie można przekierować. Anulowanie."
 
 msgid "Download redirected to ''{0}''"
-msgstr "Pobieranie przekierowanie do ''{0}''"
+msgstr "Pobieranie przekierowanie do „{0}”"
 
 msgid "Too many redirects to the download URL detected. Aborting."
 msgstr ""
@@ -18052,10 +18050,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "na dachu"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "kiosk"
-
 msgid "Start date"
 msgstr "Data uruchomienia"
 
@@ -19295,13 +19289,13 @@ msgid "Reservoir"
 msgstr "Sztuczne jezioro"
 
 msgid "evaporator"
-msgstr ""
+msgstr "parownik"
 
 msgid "tailings"
-msgstr ""
+msgstr "odpady"
 
 msgid "water_storage"
-msgstr ""
+msgstr "zbiornik_wody"
 
 msgid "Covered Reservoir"
 msgstr "Zakryty sztuczny zbiornik wody"
@@ -19550,6 +19544,9 @@ msgstr "Biodiesel"
 msgid "Octane 80"
 msgstr "Paliwo 80-oktanowe"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "Benzyna bezołowiowa 91"
 
@@ -19571,6 +19568,9 @@ msgstr "E10 (bioetanol 10%)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (bioetanol 85%)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "Gaz LPG"
 
@@ -20384,13 +20384,13 @@ msgid "Campsite"
 msgstr "Kemping"
 
 msgid "Caravans allowed"
-msgstr "Dozwolone przyczepy kempingowe"
+msgstr "Przyczepy kempingowe"
 
 msgid "Backcountry"
-msgstr "Na odludziu"
+msgstr "Na odosobnieniu"
 
 msgid "Group only access"
-msgstr "Tylko dla członków"
+msgstr "Tylko grupami"
 
 msgid "Food+Drinks"
 msgstr "Wyżywienie"
@@ -21644,7 +21644,7 @@ msgstr ""
 
 msgctxt "piste:grooming"
 msgid "mogul"
-msgstr ""
+msgstr "mulda"
 
 msgctxt "piste:grooming"
 msgid "skating"
@@ -21656,7 +21656,7 @@ msgstr ""
 
 msgctxt "piste:grooming"
 msgid "scooter"
-msgstr ""
+msgstr "skutery"
 
 msgctxt "piste:grooming"
 msgid "backcountry"
@@ -22218,6 +22218,12 @@ msgstr "Fontanna"
 msgid "Water Well"
 msgstr "Studnia"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Latarnia morska"
 
@@ -25266,7 +25272,7 @@ msgid "DigitalGlobe Standard Imagery Vintage"
 msgstr ""
 
 msgid "Esri World Imagery"
-msgstr ""
+msgstr "Obrazowanie świata Esri"
 
 msgid "OpenCycleMap"
 msgstr "OpenCycleMap"
@@ -25313,6 +25319,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"
 
@@ -25320,7 +25353,7 @@ msgid "Stamen Terrain"
 msgstr ""
 
 msgid "Cambodia, Laos, Thailand, Vietnam, Malaysia, Myanmar bilingual"
-msgstr ""
+msgstr "Kambodża, Laos, Tajlandia, Wietnam, Malezja, dwujęzyczny Myanmar"
 
 msgid "OpenPT Map (overlay)"
 msgstr "OpenPT Map (nakładka)"
@@ -25394,8 +25427,8 @@ msgstr "OSM Inspector: Adresy"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM Inspector: Linia brzegowa (EU)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr "imagico.de OSM zdjęcia do mapowania: Góry Północnoalbańskie"
+msgid "imagico.de: Prokletije Mountains"
+msgstr "imagico.de: Góry Północnoalbańskie"
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
@@ -25409,7 +25442,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 ""
@@ -25417,21 +25450,43 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
-msgstr "imagico.de OSM zdjęcia do mapowania: Pensacola Mountains"
+msgid "imagico.de: Pensacola Mountains"
+msgstr "imagico.de: Pensacola Mountains"
 
-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 ""
 
@@ -25541,42 +25596,42 @@ msgid "IGN orthophoto San Juan (WMTS)"
 msgstr ""
 
 msgid "IGN orthophoto San Luis (WMTS)"
-msgstr ""
+msgstr "Ortofotomapa IGN dla San Luis (WMTS)"
 
 msgid "IGN orthophoto Santa Cruz III (WMTS)"
-msgstr ""
+msgstr "Ortofotomapa IGN dla Santa Cruz III (WMTS)"
 
 msgid "IGN orthophoto Santa Cruz IV (WMTS)"
-msgstr ""
+msgstr "Ortofotomapa IGN dla Santa Cruz IV (WMTS)"
 
 msgid "IGN orthophoto Santa Cruz VI (WMTS)"
-msgstr ""
+msgstr "Ortofotomapa IGN dla Santa Cruz VI (WMTS)"
 
 msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
-msgstr ""
+msgstr "Ortofotomapa IGN dla Santa Fe i Paraná (WMTS)"
 
 msgid "IGN orthophoto Tucumán (WMTS)"
-msgstr ""
+msgstr "Ortofotomapa IGN dla Tucumán (WMTS)"
 
 msgid "IGN orthophoto Ushuaia (WMTS)"
-msgstr ""
+msgstr "Ortofotomapa IGN dla Ushuaia (WMTS)"
 
 msgid "Educational map (WMS)"
 msgstr ""
 
 msgid "Ministry of Agroindustry (WMS)"
-msgstr ""
+msgstr "Ministerstwo Agroprzemysłu (WMS)"
 
 msgid "Ministry of Energy and Mining (WMS)"
-msgstr ""
+msgstr "Ministerstwo Energii i Górnictwa (WMS)"
 
-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"
@@ -25609,14 +25664,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 ""
@@ -25628,7 +25683,7 @@ msgid "basemap.at"
 msgstr "basemap.at"
 
 msgid "Basemap of Austria, based on goverment data."
-msgstr ""
+msgstr "Mapa bazowa Austrii, oparta o dane rządowe."
 
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at - ortofotomapy"
@@ -25638,7 +25693,7 @@ msgid ""
 msgstr ""
 
 msgid "Geoimage.at MaxRes"
-msgstr ""
+msgstr "Geoimage.at Maksymalna rozdzielczość"
 
 msgid "Graz: Basiskarte (base map)"
 msgstr ""
@@ -25682,7 +25737,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)"
@@ -25698,7 +25753,7 @@ msgid "OpenStreetMap (Belgian Style - German)"
 msgstr "OpenStreetMap (styl belgijski - Niemcy)"
 
 msgid "Orthophoto IGN-NGI"
-msgstr ""
+msgstr "Ortofotomapa IGN-NGI"
 
 msgid "AGIV Flanders most recent aerial imagery"
 msgstr ""
@@ -25769,13 +25824,13 @@ msgstr "TEC przystanki autobusowe"
 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)"
@@ -25943,34 +25998,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 ""
@@ -25978,7 +26032,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)"
@@ -26026,7 +26080,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -26034,7 +26088,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 ""
@@ -26203,8 +26257,7 @@ msgstr ""
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr "Metropole Ruhr: zdjęcia lotnicze (10 cm)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
+msgid "imagico.de: Northern German west coast tidalflats"
 msgstr ""
 
 msgid ""
@@ -26212,9 +26265,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 ""
@@ -26222,10 +26273,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"
@@ -26258,57 +26309,52 @@ msgstr "Moguncja (Mainz): ostatnie podkłady lotnicze"
 msgid "Munich latest aerial imagery 60cm"
 msgstr "Monachium: ostatnie zdjęcia lotnicze 60cm"
 
-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 ""
@@ -26316,13 +26362,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 ""
@@ -26390,13 +26436,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 ""
@@ -26404,7 +26450,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -26412,7 +26458,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -26420,19 +26466,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 ""
@@ -26537,13 +26583,13 @@ msgstr "Japonia GSI orto zdjęcia"
 msgid "Japan GSI Standard Map"
 msgstr "Japonia GSI Standardowa Mapa"
 
-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 ""
@@ -26551,7 +26597,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)"
@@ -26645,13 +26691,6 @@ msgid ""
 "Official Norwegian place names from the SSR database. Selectable categories."
 msgstr ""
 
-msgid "MTBmap.no"
-msgstr "MTBmap.no"
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr ""
 
@@ -26739,6 +26778,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 ""
 
@@ -26747,6 +26800,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 "MTBmap.no"
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
 msgid "NP Svalbard Orthophoto"
 msgstr ""
 
@@ -26754,13 +26831,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 ""
@@ -26774,7 +26851,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 ""
@@ -26782,29 +26859,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)"
@@ -26873,8 +26949,11 @@ msgstr "Katowice: Budynki"
 msgid "Łódź: Buildings"
 msgstr "Łódź: Budynki"
 
-msgid "Łódź: Orthophotomap (aerial image)"
-msgstr "Łódź: Ortofotomapa (zdjęcia lotnicze)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr ""
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
+msgstr ""
 
 msgid "Powiat dębicki: Buildings"
 msgstr "Powiat dębicki: Budynki"
@@ -26906,6 +26985,12 @@ msgstr "Powiat stalowowolski: Budynki"
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr "Poznań: Ortofotomapa 2014 (zdjęcia lotnicze)"
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr ""
+
+msgid "Poznań: Buildings"
+msgstr ""
+
 msgid "Przemyśl: Buildings"
 msgstr "Przemyśl: Budynki"
 
@@ -26954,33 +27039,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 ""
@@ -26988,7 +27071,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)"
@@ -27034,25 +27117,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"
@@ -27076,7 +27159,7 @@ msgstr "IDEIB - Baleary"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "Wyspy Kanaryjskie: GRAFCAN Express"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -27172,7 +27255,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 ""
@@ -27180,6 +27263,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 ""
 
@@ -27198,7 +27288,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)"
@@ -27260,7 +27350,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 ""
@@ -27268,13 +27358,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)"
@@ -27361,7 +27451,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 ""
@@ -27369,7 +27466,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"
@@ -27384,6 +27481,12 @@ msgstr "Ukraina - Kijów 2014 (DZK)"
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -28394,49 +28497,37 @@ msgstr "{0} powinno być wartością całkowitą pomiędzy -5 i 5"
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr "{0} powinno zawierać tylko liczby z opcjonalnym zwiększeniem .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}: metry są domyślne; kropka jest separatorem; jeśli jednostka to po spacji"
 
 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}: tony są domyślne; kropka jest separatorem; jeśli jednostka to po spacji"
 
-msgid "unusual {0} format"
-msgstr "niespotykany format {0}"
+msgid "unusual value of {0}"
+msgstr "Niespotykana wartość {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}: kilometry są domyślne; kropka jest separatorem; jeśli jednostka to po "
-"spacji"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 "napięcie powinno być wyrażone w woltach bez jednostki/separatora/odstępów"
 
-msgid "unusual {0} specification"
-msgstr "niespotykana specyfikacja {0}"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "niespotykany rozstaw szyn kolejowych; proszę użyć mm bez separatora"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr ""
-"niespotykane nachylenie; proszę użyć procentów/stopni lub do góry/w dół"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} musi być wartością liczbową"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} musi być dodatnią liczbą całkowitą"
 
-msgid "unusual value of {0}"
-msgstr "Niespotykana wartość {0}"
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr "{0} musi być wartością numeryczną, w metrach i bez jednostek"
 
@@ -28554,6 +28645,9 @@ msgstr "Ukrywaj ikony przy niskim przybliżeniu"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Bardziej stonowane symbole przy niskim przybliżeniu"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Wyświetlaj etykiety ulic (przy wysokim przybliżeniu)"
 
@@ -28602,6 +28696,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."
@@ -28639,6 +28736,9 @@ msgstr ""
 "Implementuje wiersz poleceń i umożliwia tworzenie własnych poleceń. Proszę "
 "sprawdzić odnośnik dla typowych poleceń (łuk, okrąg itp.)."
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -28694,6 +28794,11 @@ msgstr "Wyświetla profil wysokości i pewne dane statystyczne śladu GPX."
 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 "Używa zewnętrznych skryptów w JOSM"
 
@@ -28892,6 +28997,9 @@ msgstr ""
 "Pozwala na otworzenie plików gpx/osm, które mają część wspólną z obecnie "
 "wyświetlanym obszarem."
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -29710,580 +29818,6 @@ msgstr ""
 msgid "Error while creating image layer: "
 msgstr "Błąd tworzenia warstwy obrazu: "
 
-msgid "Mapillary Images"
-msgstr "Obrazy Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Warstwy Mapillary"
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr ""
-
-msgid "{0} imported images"
-msgstr "{0} zaimportowanych obrazów"
-
-msgid "{0} downloaded images"
-msgstr "{0} pobranych obrazów"
-
-msgid "{0} images in total"
-msgstr "{0} łącznie obrazów"
-
-msgid "{0} images in {1} sequences"
-msgstr "{0} obrazów w {1} sekwencjach"
-
-msgid "Mapillary object layer"
-msgstr "Warstwa obiektów Mapillary"
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
-"Wyświetla warstwę pokazującą obiekty na mapie wykryte przez Mapillary"
-
-msgid "Open Mapillary layer"
-msgstr "Otwórz wartwę Mapillary"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Download Mapillary images in current view"
-msgstr "Pobierz obrazy Mapillary w obecnym widoku"
-
-msgid "Export pictures"
-msgstr "Eksportuj zdjęcia"
-
-msgid "Export Mapillary pictures"
-msgstr "Eksportuj zdjęcia Mapillary"
-
-msgid "Export images"
-msgstr "Eksportuj obrazy"
-
-msgid "Import pictures"
-msgstr "Importuj zdjęcia"
-
-msgid "Import local pictures"
-msgstr "Importuj lokalne zdjęcia"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Importuj zdjęcia na warstwę Mapillary"
-
-msgid "Join mode"
-msgstr "Tryb łączenia"
-
-msgid "Join/unjoin pictures"
-msgstr "Łączenie/rozłączanie zdjęć"
-
-msgid "Submit changeset"
-msgstr "Zatwierdź zestaw zmian"
-
-msgid "Submit the current changeset"
-msgstr "Zatwierdź obecny zestaw zmian"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "Zatwierdź obecny zestaw zmian do Mapillary"
-
-msgid "rejected"
-msgstr "odrzucone"
-
-msgid "pending"
-msgstr "oczekujące"
-
-msgid "approved"
-msgstr "przyjęte"
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr "{0} zdjęć zatwierdzonych, Klucz zestawu zmian: {1}, stan: {2}"
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr "Błąd wysyłania zestawu zmian z {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 ""
-"Wystąpił błąd podczas próby wysyłania zestawu zmian. Jeśli powtarza się to "
-"często, zgłoś błąd poprzez menu pomocy. Jeśli wiadomość pojawiła się "
-"pierwszy raz, po prostu spróbuj ponownie. Może wystąpiły jakieś problemy z "
-"połączeniem internetowym."
-
-msgid "Upload Mapillary images"
-msgstr "Wyślij obrazy Mapillary"
-
-msgid "Walk mode"
-msgstr "Tryb spaceru"
-
-msgid "Zoom to selected image"
-msgstr "Powiększ do wybranego obrazu"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Powiększ do obecnie wybranego obrazu"
-
-msgid "Current Mapillary changeset"
-msgstr "Obecny zestaw zmian Mapillary"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Otwórz okno zestawu zmian Mapillary"
-
-msgid "Mapillary changeset"
-msgstr "Zestaw zmian Mapillary"
-
-msgid "Submitting changeset to server…"
-msgstr "Wysyłanie zestawu zmian na serwer…"
-
-msgid "Export all images"
-msgstr "Eksportuj wszystkie obrazy"
-
-msgid "Export selected sequence"
-msgstr "Eksportuj wybraną sekwencję"
-
-msgid "Export selected images"
-msgstr "Eksportuj wybrane obrazy"
-
-msgid "Rewrite imported images"
-msgstr "Przepisz zaimportowane obrazy"
-
-msgid "Select a directory"
-msgstr "Wybierz katalog"
-
-msgid "Explore"
-msgstr "Przeglądaj"
-
-msgid "Speed limit"
-msgstr "Ograniczenie prędkości"
-
-msgid "Give way"
-msgstr "Ustąp pierwszeństwa"
-
-msgid "No entry"
-msgstr "Zakaz wjazdu"
-
-msgid "Intersection danger"
-msgstr "Niebezpieczne skrzyżowanie"
-
-msgid "Mandatory direction (any)"
-msgstr "Nakaz skrętu"
-
-msgid "Uneven road"
-msgstr "Koleiny"
-
-msgid "No parking"
-msgstr "Zakaz postoju"
-
-msgid "No overtaking"
-msgstr "Zakaz wyprzedzania"
-
-msgid "Pedestrian crossing"
-msgstr "Przejście dla pieszych"
-
-msgid "No turn"
-msgstr "Zakaz zawracania"
-
-msgid "Years"
-msgstr "Lata"
-
-msgid "Months"
-msgstr "Miesiące"
-
-msgid "Days"
-msgstr "Dni"
-
-msgid "Imported images"
-msgstr "Zaimportowane obrazy"
-
-msgid "Mapillary filter"
-msgstr "Filtr Mapillary"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Otwiera okno filtrów Mapillary"
-
-msgid "Not older than: "
-msgstr "Nie starsze niż: "
-
-msgid "Downloaded images"
-msgstr "Pobrane obrazy:"
-
-msgid "Only images with signs"
-msgstr "Tylko obrazy ze znakami:"
-
-msgid "Choose signs"
-msgstr "Wybierz znaki:"
-
-msgid "Mapillary history"
-msgstr "Historia Mapillary"
-
-msgid "Open Mapillary history dialog"
-msgstr "Otwiera okno histori Mapillary"
-
-msgid "No image selected"
-msgstr "Nie wybrano obrazu"
-
-msgid "Press \"{0}\" to download images"
-msgstr "Wciśnij \"{0}\" aby pobrać obrazy"
-
-msgid "Mapillary picture"
-msgstr "Zdjęcie Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Otwiera okno Mapillary"
-
-msgid "Next picture"
-msgstr "Następne zdjęcie"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Pokazuje następne zdjęcie w sekwencji"
-
-msgid "Previous picture"
-msgstr "Poprzednie zdjęcie"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Pokazuje poprzednie zdjęcie w sekwencji"
-
-msgid "Jump to red"
-msgstr "Skocz do czerwonego"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Przeskakuje do zdjęcia po drugiej stronie czerwonej linii"
-
-msgid "Jump to blue"
-msgstr "Skocz do niebieskiego"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Przeskakuje do zdjęcia po drugiej stronie niebieskiej linii"
-
-msgid "Stops the walk."
-msgstr "Zatrzymaj spacer."
-
-msgid "Play"
-msgstr "Idź"
-
-msgid "Continues with the paused walk."
-msgstr "Kontynuuje przerwany spacer."
-
-msgid "Pause"
-msgstr "Zatrzymaj"
-
-msgid "Pauses the walk."
-msgstr "Zatrzymuje spacer."
-
-msgid "Display hour when the picture was taken"
-msgstr "Wyświetlaj godzinę wykonania zdjęcia."
-
-msgid "Use 24 hour format"
-msgstr "Używaj formatu 24-godzinnego."
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr ""
-"Przesuwaj do lokalizacji zdjęć za pomocą przycisków następny/poprzedni."
-
-msgid "Preview images when hovering its icon"
-msgstr "Podgląd zdjęć po najechaniu na ich ikonę"
-
-msgid "Cut off sequences at download bounds"
-msgstr "Obetnij sekwencje na granicach pobierania"
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-"Podczas odwierania obrazu Mapillary w przeglądarce, pokaż edytor rozmazania "
-"zamiast podglądu zdjęcia"
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr "Włącz tryb eksperymentalny (może być niestabilny)"
-
-msgid "Download mode"
-msgstr "Tryb pobierania"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr "Ilość obrazów które mają być wstępnie pobrane (do przodu i tyłu)"
-
-msgid "You are logged in as ''{0}''."
-msgstr "Jesteś zalogowany jako \"{0}\"."
-
-msgid "You are currently not logged in."
-msgstr "Nie jesteś zalogowany."
-
-msgid "Login"
-msgstr "Zaloguj"
-
-msgid "Logout"
-msgstr "Wyloguj"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr "Wejdź w ustawienia i zaloguj się na Mapillary przed wysłaniem."
-
-msgid "Upload selected sequence"
-msgstr "Wyślij wybraną sekwencję"
-
-msgid "Delete after upload"
-msgstr "Usuń po wysłaniu"
-
-msgid "Wait for full quality pictures"
-msgstr "Czekaj na zdjęcia w pełnej rozdzielczości"
-
-msgid "Follow selected image"
-msgstr "Podążaj za wybranym zdjęciem"
-
-msgid "Go forward"
-msgstr "Idź do przodu"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr "Które warstwy zdjęć chcesz zaimportować do warstwy Mapillary?"
-
-msgid "Import"
-msgstr "Import"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-"Nie można zaimportować zdjęc z zapisaną pozycją GPS do warstwy Mapillary."
-
-msgid "{0} ({1} images)"
-msgstr "{0} ({1} zdjęć)"
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr "Z jakiego źródła chcesz zaimportować zdjęcia do warstwy Mapillary?"
-
-msgid "There are currently no layers with geotagged images!"
-msgstr "Nie ma obecnie warstw ze zdjęciami z zapisaną pozycją GPS."
-
-msgid "Images from my file system"
-msgstr "Zdjęcia z mojego systemu plików"
-
-msgid "Select the images you want to import"
-msgstr "Wybierz zdjęcia które chcesz zaimportować"
-
-msgid "All images in a directory"
-msgstr "Wszystkie zdjęcia w katalogu"
-
-msgid "Select directory to import images from"
-msgstr "Wybierz katalog z którego zaimportować zdjęcia"
-
-msgid "From existing image layer"
-msgstr "Z istniejącej warstwy zdjęć"
-
-msgid "Import exception"
-msgstr "Wyjątek importowania"
-
-msgid "Could not import the image ''{0}''!"
-msgstr "Nie można zaimportować zdjęcia ''{0}''!"
-
-msgid "Could not import the directory ''{0}''!"
-msgstr "Nie można zaimportować katalogu ''{0}''!"
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-"Znacznik z kluczem <i>{0}</i> obecnie istnieje w wybranym obiekcie OSM."
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr "Na pewno chcesz zamienić obecną wartość <i>{0}</i> nową <i>{1}</i>?"
-
-msgid "Tag conflict"
-msgstr "Konflikt znaczników"
-
-msgid "Key copied to clipboard"
-msgstr "Klucz skopiowany do schowka"
-
-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 ""
-"Wtyczka Mapillary uzywa teraz osobnego panelu do wyświetlania dodatkowych "
-"informacji (jak klucz obrazu) i akcji dla obecnie wybranego obrazu Mapillary "
-"(np. wyświetlanie w przeglądarce)."
-
-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 ""
-"Może on zostać aktywowany poprzez naciśnięcie lewego przycisku myszy na "
-"przycisk tej wiadomości lub przycisk na pasku narzędzi po lewej, który używa "
-"takiej samej ikony."
-
-msgid "I got it, close this."
-msgstr "Zrozumiałem, zamknij okno."
-
-msgid "Image info"
-msgstr "Informacje o obrazie"
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-"Wyświetla szczegółowe informacje o obecnie wybranym obrazie Mapillary"
-
-msgid "Show detections on top of image"
-msgstr "Pokaż wykrywanie na górze obrazu"
-
-msgid "View in browser"
-msgstr "Zobacz w przeglądarce"
-
-msgid "Copy key"
-msgstr "Kopuj klucz"
-
-msgid "Add Mapillary tag"
-msgstr "Dodaj znacznik Mapillary"
-
-msgid "Image detections"
-msgstr "Wykrywanie zdjęcia"
-
-msgid "Image actions"
-msgstr "Akcje zdjęcia"
-
-msgid "Image key"
-msgstr "Klucz zdjęcia"
-
-msgid "Sequence key"
-msgstr "Klucz sekwencji"
-
-msgid "{0} detections"
-msgstr "{0} wykryć"
-
-msgid "image has no key"
-msgstr "obraz nie ma klucza"
-
-msgid "unknown user"
-msgstr "nieznany użytkownik"
-
-msgid "sequence has no key"
-msgstr "sekwencja nie ma klucza"
-
-msgid "Could not open the URL {0} in a browser"
-msgstr "Nie można otworzyć adresu URL {0} w przeglądarce"
-
-msgid "Downloading map objects…"
-msgstr "Pobieranie elementów mapy…"
-
-msgid "All map objects loaded."
-msgstr "Wsyzstkie dane mapy załadowane."
-
-msgid "Too many map objects, zoom in to see all."
-msgstr "Za dużo elementów mapy, przybliż żeby zobaczyć wszystko."
-
-msgid "Downloading map objects failed!"
-msgstr "Błąd pobierania elementów mapy!"
-
-msgid "Mapillary objects"
-msgstr "Obiekty Mapillary"
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr "Wyświetla obiekty wykryte przez Mapillary z ich podkładu street view"
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] "Usunięto {0} zdjęcie"
-msgstr[1] "Usunięto {0} zdjęcia"
-msgstr[2] "Usunięto {0} zdjęć"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "Zaimportowano {0} zdjęć"
-msgstr[1] "Zaimportowano {0} zdjęcia"
-msgstr[2] "Zaimportowano {0} zdjęć"
-
-msgid "2 images joined"
-msgstr "2 zdjęcia połączone"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "Przeniesiono {0} zdjęcie"
-msgstr[1] "Przeniesiono {0} zdjęcia"
-msgstr[2] "Przesniesiono {0} zdjęć"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "Obrócono {0} zdjęcie"
-msgstr[1] "Obrócono {0} zdjęcia"
-msgstr[2] "Obrócono {0} zdjęć"
-
-msgid "2 images unjoined"
-msgstr "2 zdjęcia rozłączone"
-
-msgid "Could not read from URL {0}!"
-msgstr "Nie można odczytać z URL {0}!"
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-"{0}\n"
-"Nie można odczytać elementów mapy z URL\n"
-"{1}!"
-
-msgid "everything in the visible area"
-msgstr "wszystko w widocznym obszarze"
-
-msgid "areas with downloaded OSM-data"
-msgstr "obszary z pobranymi danymi OSM"
-
-msgid "only when manually requested"
-msgstr "tylko przy ręcznym żądaniu"
-
-msgid ""
-"The Mapillary layer has stopped downloading images, because the requested "
-"area is too big!"
-msgstr ""
-"Warstwa Mapillary przestała pobierać obrazy, ponieważ żądany obszar jest za "
-"duży!"
-
-msgid ""
-"To solve this problem, you could zoom in and load a smaller area of the map."
-msgstr ""
-"By rozwiązać ten problem, powinieneś przybliżyć i załadować mniejszy obszar "
-"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 ""
-"By rozwiązać ten problem, powinieneś przełączyć na tryb pobierania ''{0}'' i "
-"załadować obrazy Mapillary z mniejszej części mapy."
-
-msgid "Downloading"
-msgstr "Pobieranie"
-
-msgid "Select mode"
-msgstr "Wybierz tryb"
-
-msgid "Mapillary login"
-msgstr "Logowanie Mapillary"
-
-msgid "Login successful, return to JOSM."
-msgstr "Zalogowano pomyślnie, powrót do JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Obsługiwane formaty obrazów (JPG i PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "Pobieranie obrazów Mapillary"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Łącznie obrazów Mapillary: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr "Wysyłanie zestawu zmian Mapillary"
-
-msgid "No images found"
-msgstr "Nie znaleziono zdjęć"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr "Pomyślnie wysłano {0} obrazów do mapillary.com"
-
-msgid "Finished upload"
-msgstr "Zakończono wysyłanie"
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr "Nie jesteś zalogowany, proszę to zrobić w ustawieniach Mapillary"
-
-msgid "Not Logged in to Mapillary"
-msgstr "Nie zalogowany do Mapillary"
-
-msgid "Uploading: {0}"
-msgstr "Wysyłanie: {0}"
-
 msgid "NanoLog"
 msgstr ""
 
@@ -30978,6 +30512,109 @@ 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 ""
+"To narzędzie może tylko podmienić węzeł, przekształcić węzeł w linię lub "
+"wielokąt złożony, lub zamienić linię na inną linię."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "Węzeł należy do linii, nie można zamienić."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+"Ta relacja nie jest wielokątem złożonym i nie można jej użyć do zastąpienia."
+
+msgid "Replace geometry for node {0}"
+msgstr "Zastąp geometrię dla węzła {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Wybierz jedną linię istniejącą w bazie danych i jedną linię z poprawną "
+"geometrią."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "Linia musi zawierać się całkowicie w pobranym obszarze"
+
+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 "Zastąp geometrię dla linii {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Dodano zbyt dużo linii: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -31011,9 +30648,30 @@ msgstr "Znaczniki budynków:"
 msgid "Cannot place building outside of the world."
 msgstr "Nie można umieścić budynków poza światem."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Utwórz budynek"
 
+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 "Ustal wielkości budynków"
 
@@ -31026,8 +30684,17 @@ msgstr "Automatyczne zaznaczanie budynku"
 msgid "Use address nodes under buildings"
 msgstr "Używanie węzłów adresowych w obszarze budynków"
 
-msgid "Buildings width:"
-msgstr "Szerokość budynków:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Długość segmentu:"
@@ -31713,6 +31380,18 @@ msgstr "Usuń zaznaczony schemat z listy."
 msgid "Color Schemes"
 msgstr "Schematy kolorów"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Anuluje edycje znaczników i zamyka okno"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Wprowadza zmienione znaczniki i zamyka okno"
+
 msgid "Conflation"
 msgstr ""
 
@@ -32207,6 +31886,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr "Zaloguj"
+
 msgid "Enable autologin"
 msgstr "Włącz automatyczne logowanie"
 
@@ -32240,24 +31922,15 @@ msgstr "Prywatna rozmowa"
 msgid "Close tab"
 msgstr "Zamknij zakładkę"
 
+msgid "Logout"
+msgstr "Wyloguj"
+
 msgid "Clear log"
 msgstr "Wyczyść log"
 
 msgid "Show users on map"
 msgstr "Pokaż użytkowników na mapie"
 
-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 "Tylko pozycja"
 
@@ -32345,6 +32018,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr "Import"
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -33038,8 +32714,26 @@ msgstr ""
 msgid "Offset into background:"
 msgstr ""
 
-msgid "Indoor Mapping Helper"
-msgstr "Pomocnik Mapowania W"
+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 "Aktywuj"
@@ -33071,35 +32765,94 @@ msgstr "Ustawia znacznik ref jeśli wybrany jest pokój"
 msgid "Apply Tags"
 msgstr "Zatwierdź znaczniki"
 
-msgid "Fitting"
-msgstr "Dopasowywanie"
+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>Pomyśl teraz o dopasowaniu swoich planów budynku.<br>W tym celu użyj "
-"wtyczki PicLayer, którą możesz zainstalować w ustawieniach JOSM.</html>"
-
-msgid "Level Selection"
-msgstr "Wybór poziomu"
 
-msgid "Lowest Level"
-msgstr "Najniższy poziom"
-
-msgid "The lowest level of your building."
-msgstr "Najniższy poziom tego budynku."
+msgid "level number:"
+msgstr ""
 
-msgid "Highest Level"
-msgstr "Najwyższy poziom"
+msgid "Example: ''2'' or ''3''"
+msgstr ""
 
-msgid "The highest level of your building."
-msgstr "Najwyższy poziom tego budynku."
+msgid "Indoor Mapping Helper"
+msgstr "Pomocnik Mapowania W"
 
 msgid "Toolbox for indoor mapping assistance"
 msgstr "Asystent mapowania indoor"
 
+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 ""
 
@@ -34192,6 +33945,27 @@ msgstr "Nieznane rozszerzenie pliku: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Nie udało się przetworzyć pliku „{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"
 
@@ -34527,6 +34301,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr "Nie wybrano obrazu"
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -35270,6 +35047,9 @@ msgstr ""
 msgid "State"
 msgstr "Stan"
 
+msgid "pending"
+msgstr "oczekujące"
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -35680,12 +35460,6 @@ msgstr "Nowa wartość dla {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr "Błąd otwarcia połączenia z 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>"
@@ -36025,12 +35799,6 @@ msgstr "Wtyczka edycji znaczników"
 msgid "Presets"
 msgstr "Szablony"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Anuluje edycje znaczników i zamyka okno"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Wprowadza zmienione znaczniki i zamyka okno"
-
 msgid "Highlight"
 msgstr "Wyróżnij"
 
@@ -36314,10 +36082,10 @@ msgid "Browse"
 msgstr "Przeglądaj"
 
 msgid "Browse map with left button"
-msgstr ""
+msgstr "Przeglądaj mapę za pomocą lewego przycisku"
 
 msgid "Merge objects nodes"
-msgstr ""
+msgstr "Połącz węzły obiektów"
 
 msgid "Tracer"
 msgstr "Tracer"
@@ -36429,10 +36197,10 @@ msgid "Export sigs..."
 msgstr ""
 
 msgid "Export all signatures to XML file."
-msgstr ""
+msgstr "Eksportowanie wszystkich podpisów do pliku XML."
 
 msgid "Export sigs to XML..."
-msgstr ""
+msgstr "Eksport podpisów do XML..."
 
 msgid "Save Signatures file"
 msgstr "Zapisz plik podpisów"
@@ -36456,7 +36224,7 @@ msgid "Load objects from server"
 msgstr "Wczytaj obiekty z serwera"
 
 msgid "Download signed data"
-msgstr ""
+msgstr "Pobierz podpisane dane"
 
 msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
 msgstr ""
@@ -36483,10 +36251,10 @@ msgid "Unknown"
 msgstr "Nieznany"
 
 msgid "Object signatures"
-msgstr ""
+msgstr "Podpisy obiektów"
 
 msgid "Open object signing window."
-msgstr ""
+msgstr "Otwórz okno podpisywania obiektów."
 
 msgid "Check"
 msgstr "Sprawdź"
@@ -36711,7 +36479,7 @@ msgid "Build unidirectional road"
 msgstr ""
 
 msgid "Bidirectional road"
-msgstr ""
+msgstr "Droga dwukierunkowa"
 
 msgid "Build bidirectional road"
 msgstr ""
@@ -37701,44 +37469,6 @@ msgstr ""
 "To narzędzie zamienia geometrię jednego obiektu z inną i dlatego wymaga "
 "wybrania dokładnie dwóch obiektów."
 
-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 ""
-"To narzędzie może tylko podmienić węzeł, przekształcić węzeł w linię lub "
-"wielokąt złożony, lub zamienić linię na inną linię."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "Węzeł należy do linii, nie można zamienić."
-
-msgid "Replace geometry for node {0}"
-msgstr "Zastąp geometrię dla węzła {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-"Ta relacja nie jest wielokątem złożonym i nie można jej użyć do zastąpienia."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Wybierz jedną linię istniejącą w bazie danych i jedną linię z poprawną "
-"geometrią."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "Linia musi zawierać się całkowicie w pobranym obszarze"
-
-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 "Zastąp geometrię dla linii {0}"
-
 msgid "Replace Membership"
 msgstr "Zmień przynależność"
 
@@ -37815,9 +37545,6 @@ msgstr "Zaznacza środkowe węzły"
 msgid "Please select two nodes connected by way!"
 msgstr "Proszę zaznaczyć dwa węzły połączone linią!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Dodano zbyt dużo linii: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Wszystko wewnątrz (testowe)"
 
@@ -38113,10 +37840,10 @@ msgid "Show/hide Sophox snippet list"
 msgstr ""
 
 msgid "help"
-msgstr ""
+msgstr "pomoc"
 
 msgid "Server: "
-msgstr ""
+msgstr "Serwer: "
 
 msgid "Wikidata+OSM server"
 msgstr ""
@@ -38231,22 +37958,22 @@ msgid "Test"
 msgstr "Test"
 
 msgid "View website"
-msgstr ""
+msgstr "Wyświetl stronę internetową"
 
 msgid "View URL"
-msgstr ""
+msgstr "Wyświetl adres URL"
 
 msgid "Send Email"
-msgstr ""
+msgstr "Wyślij e-mail"
 
 msgid "View image"
-msgstr ""
+msgstr "Wyświetl obraz"
 
 msgid "View %name% article"
 msgstr ""
 
 msgid "View Wikidata page"
-msgstr ""
+msgstr "Wyświetl stronę Wikidata"
 
 msgid "View Wikispecies page"
 msgstr ""
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index 1e1e65a..f36ae87 100644
--- a/i18n/po/pt.po
+++ b/i18n/po/pt.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-12 20:06+0000\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-27 14:41+0000\n"
 "Last-Translator: Rui <xande6ruz at yandex.com>\n"
 "Language-Team: Portuguese <pt at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:58+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:58+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: pt\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1046,8 +1046,8 @@ msgstr "Introduza o URL a descarregar:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Introduza o endereço web de onde os dados devem ser descarregados"
 
-msgid "Separate Layer"
-msgstr "Camada separada"
+msgid "Download as new layer"
+msgstr "Descarregar numa camada nova"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr ""
@@ -2494,12 +2494,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"
@@ -9072,9 +9072,6 @@ msgstr "O valor de latitude tem de ser no intervalo [-90,90]."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "O valor de longitude tem de ser no intervalo [-180,180]."
 
-msgid "Download as new layer"
-msgstr "Descarregar numa camada nova"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10765,6 +10762,9 @@ msgstr "Nenhuns dados encontrados no ficheiro ''{0}''."
 msgid "Open OSM file"
 msgstr "Abrir ficheiro OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr "Ficheiros de Validação de Erros"
 
@@ -14177,9 +14177,6 @@ msgstr "Controlo Remoto"
 msgid "Settings for the remote control feature."
 msgstr "Definições para a funcionalidade de Controlo Remoto"
 
-msgid "Download objects to new layer"
-msgstr "Descarregar objetos numa nova camada"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Confirmar todas as ações de Controlo Remoto manualmente"
 
@@ -16133,6 +16130,12 @@ msgstr "Manter módulo"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Clique para manter o módulo ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Não foi possível instalar o módulo ''{0}'' do ficheiro temporário "
+"descarregado ''{1}''. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Não foi possível eliminar o módulo desatualizado ''{0}''."
 
@@ -16144,12 +16147,6 @@ msgstr ""
 "cancelada. O JOSM irá carregar a versão anterior existente do módulo."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Não foi possível instalar o módulo ''{0}'' do ficheiro temporário "
-"descarregado ''{1}''. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -18168,10 +18165,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr "Data de início"
 
@@ -19683,6 +19676,9 @@ msgstr "Biodiesel"
 msgid "Octane 80"
 msgstr "80 octanas"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "91 octanas"
 
@@ -19704,6 +19700,9 @@ msgstr "E10 (mistura com 10% Etanol)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (mistura com 85% Etanol)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GPL (gás de petróleo liquefeito)"
 
@@ -22362,6 +22361,12 @@ msgstr "Fonte (decorativa)"
 msgid "Water Well"
 msgstr "Poço de Água"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Farol"
 
@@ -25469,6 +25474,33 @@ msgstr ""
 "Camada de imagens aéreas para mapeamento de pistas de esqui no "
 "OpenStreetMap. Atualizado todos os dias."
 
+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"
 
@@ -25550,8 +25582,8 @@ msgstr "OSM Inspector: Endereços"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM Inspector: Linha costeira (EU)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr "imagico.de imagens OSM para mapear: Montanhas Prokletije"
+msgid "imagico.de: Prokletije Mountains"
+msgstr "imagico.de: Montanhas Prokletije"
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
@@ -25569,8 +25601,8 @@ msgstr ""
 "Estradas e edifícios fornecidos pelo Município de Tirana, serviço alojado "
 "pelo Open Labs."
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
-msgstr "imagico.de imagens OSM para mapear: Montes Transantárticos do Sul"
+msgid "imagico.de: Southern Transantarctic Mountains"
+msgstr "imagico.de: Montes Transantárticos do Sul"
 
 msgid ""
 "Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
@@ -25579,23 +25611,45 @@ msgstr ""
 "Fora da cobertura do Landsat e por isso que não estão no LIMA e no "
 "Bing/Mapbox (cor verdadeira)"
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
-msgstr "imagico.de imagens OSM para mapear: Montanhas Pensacola"
+msgid "imagico.de: Pensacola Mountains"
+msgstr "imagico.de: Montanhas Pensacola"
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
-msgstr "imagico.de imagens OSM para mapear: Ilha Elefante/Ilha Clarence"
+msgid "imagico.de: Elephant Island/Clarence Island"
+msgstr "imagico.de: Ilha Elefante/Ilha Clarence"
 
 msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
 msgstr ""
 "Imagem bastante recente para atualizar orlas de glaciares (cor verdadeira)"
 
-msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
-msgstr "imagico.de imagens OSM para mapear: Terra de Enderby e Costa de Kemp"
+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: Terra de Enderby e Costa de Kemp"
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
 "Imagens do Sentinel-2 da Terra de Enderby e Costa de Kemp (cor verdadeira)"
 
+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 mapa topográfico (TMS)"
 
@@ -25734,16 +25788,14 @@ msgstr "Ministério da agro-indústria (WMS)"
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr "Ministério da Energia e Minas (WMS)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
-msgstr ""
-"imagico.de imagens OSM para mapear: Bahía Blanca - Argentina (maré baixa)"
+msgid "imagico.de: Bahía Blanca (low tide)"
+msgstr "imagico.de: Bahía Blanca - Argentina (maré baixa)"
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr "Lodaçais e ilhas na costa (cor verdadeira)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
-msgstr ""
-"imagico.de imagens OSM para mapear: Bahía Blanca - Argentina (maré alta)"
+msgid "imagico.de: Bahía Blanca (high tide)"
+msgstr "imagico.de: Bahía Blanca - Argentina (maré alta)"
 
 msgid "AGRI black-and-white 2.5m"
 msgstr "AGRI preto e branco 2.5m"
@@ -25775,16 +25827,16 @@ msgstr "LPI NSW Fronteiras Administrativas - Floresta Estadual"
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW Fronteiras Administrativas - Subúrbio - Reserva NPWS"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
-msgstr "imagico.de imagens OSM para mapear: Noroeste da Ilha Heard"
+msgid "imagico.de: Northwest Heard Island"
+msgstr "imagico.de: Noroeste da Ilha Heard"
 
 msgid ""
 "Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
 msgstr ""
 "Glaciares do Noroeste da Ilha Heard (entretanto mapeado) (cor falsa IR)"
 
-msgid "imagico.de OSM images for mapping: Heard Island coast"
-msgstr "imagico.de imagens OSM para mapear: Costa da Ilha Heard"
+msgid "imagico.de: Heard Island coast"
+msgstr "imagico.de: Costa da Ilha Heard"
 
 msgid ""
 "Recent image of Heard island with interior mostly cloud covered but mostly "
@@ -25851,8 +25903,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 imagens OSM para mapear: Montanhas Rila e Pirin"
+msgid "imagico.de: Rila and Pirin Mountains"
+msgstr "imagico.de: Montanhas Rila e Pirin"
 
 msgid "OpenStreetMap (Belgian Style)"
 msgstr "OpenStreetMap (Estilo Belga)"
@@ -25938,16 +25990,16 @@ msgstr "TEC paragens de autocarros"
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "Benin: Cotonou Pleiade 2016"
 
-msgid "imagico.de OSM images for mapping: Cotonou"
-msgstr "imagico.de imagens OSM para mapear: Cotonou"
+msgid "imagico.de: Cotonou"
+msgstr "imagico.de: Cotonou"
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 "Cobertura incompleta e parcialmente coberta de nuvens nas fontes habituais "
 "(cor verdadeira)"
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
-msgstr "imagico.de imagens OSM para mapear: Ilha Bouvet"
+msgid "imagico.de: Bouvet Island"
+msgstr "imagico.de: Ilha Bouvet"
 
 msgid "For more accurate coastline and glacier mapping (true color)"
 msgstr ""
@@ -26119,14 +26171,14 @@ msgstr "Imagens aéreas de alta qualidade da Cidade de Kelowna"
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna (Canadá) Estradas sobrepostas"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
-msgstr "imagico.de imagens OSM para mapear: costa leste da Ilha de Devon"
+msgid "imagico.de: Eastern Devon Island coast"
+msgstr "imagico.de: costa leste da Ilha de Devon"
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr "Linha costeira entretanto mapeada na maioria (cor falsa IR)"
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
-msgstr "imagico.de imagens OSM para mapear: ilha setentrional de Ellesmere"
+msgid "imagico.de: Northern Ellesmere Island"
+msgstr "imagico.de: ilha setentrional de Ellesmere"
 
 msgid ""
 "Assembled from July 2012 ASTER imagery (true color with estimated blue)"
@@ -26134,25 +26186,22 @@ msgstr ""
 "Imagens recolhidas de Julho de 2012 pelo ASTER (cor verdadeira com azul "
 "estimado)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
-msgstr ""
-"imagico.de imagens OSM para mapear: ilha setentrional de Ellesmere em Julho "
-"de 2016"
+msgid "imagico.de: Northern Ellesmere Island July 2016"
+msgstr "imagico.de: ilha setentrional de Ellesmere em Julho de 2016"
 
 msgid ""
 "Assembled from July 2016 ASTER imagery (true color with estimated blue)"
 msgstr ""
 "Recolhidas de Julho de 2017 pelo ASTER (cor verdadeira com azul estimado)"
 
-msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
-msgstr "imagico.de imagens OSM para mapear: Ilha do FOgo, Cabo Verde"
+msgid "imagico.de: Fogo, Cape Verde"
+msgstr "imagico.de: Ilha do FOgo, Cabo Verde"
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr "Imagens depois do erupção de 2014/2015 (cor verdadeira)"
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
-msgstr "imagico.de imagens OSM para mapear: Ilha Londonderry"
+msgid "imagico.de: Isla Londonderry"
+msgstr "imagico.de: Ilha Londonderry"
 
 msgid ""
 "A lot of very coarse coastlines could be improved here, much snow cover "
@@ -26162,8 +26211,8 @@ msgstr ""
 "tem bastante neve por isso não serve para mapeamento de glaciares (cor falsa "
 "IR)"
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
-msgstr "imagico.de imagens OSM para mapear: Vulcão Calbuco"
+msgid "imagico.de: Volcán Calbuco"
+msgstr "imagico.de: Vulcão Calbuco"
 
 msgid "Image from after the 2015 eruption (true color)"
 msgstr "Imagens depois da erupção de 2015 (cor verdadeira)"
@@ -26210,17 +26259,16 @@ msgstr "Stevns"
 msgid "Vejmidte"
 msgstr "Vejmidte"
 
-msgid "imagico.de OSM images for mapping: El Altar"
-msgstr "imagico.de OSM imagens para mapear: El Altar"
+msgid "imagico.de: El Altar"
+msgstr "imagico.de: El Altar"
 
 msgid ""
 "2007 ASTER image offering better glacier coverage than common sources (true "
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
-msgstr ""
-"imagico.de OSM imagens para mapear: ilhas de Darwin e Wolf, Galápagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
+msgstr "imagico.de: ilhas de Darwin e Wolf, Galápagos"
 
 msgid ""
 "Recent image, only old and poor images in other sources currently (true "
@@ -26391,8 +26439,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 ""
@@ -26400,9 +26447,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 ""
@@ -26410,10 +26455,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"
@@ -26446,57 +26491,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 ""
@@ -26504,13 +26544,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 ""
@@ -26579,13 +26619,13 @@ msgstr "OpenStreetMap Hungria (rotas pedestres)"
 msgid "Hillshade Hungary"
 msgstr "Hillshade Hungria"
 
-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 ""
@@ -26593,7 +26633,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -26601,7 +26641,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -26609,19 +26649,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 ""
@@ -26727,13 +26767,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 ""
@@ -26741,7 +26781,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)"
@@ -26835,13 +26875,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 ""
 
@@ -26929,6 +26962,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 ""
 
@@ -26937,6 +26984,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 ""
 
@@ -26944,13 +27015,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 ""
@@ -26964,7 +27035,7 @@ msgstr "Faixa de Gaza - Pléiades - 2014/07/06"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Faixa de Gaza - Pléiades - 2014/07/06 (NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -26972,29 +27043,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)"
@@ -27063,7 +27133,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"
@@ -27096,6 +27169,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 ""
 
@@ -27144,33 +27223,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 ""
@@ -27178,7 +27255,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)"
@@ -27224,25 +27301,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "África do Sul CD:NGI Aérea"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
+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"
@@ -27266,7 +27343,7 @@ msgstr "Ilhas Baleares - IDEIB"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "Ilhas Canárias GRAFCAN Express"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -27362,7 +27439,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 ""
@@ -27370,6 +27447,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"
 
@@ -27388,7 +27472,7 @@ msgstr "Taiwan Land-Section Data"
 msgid "NLSC Open Data WMTS"
 msgstr "NLSC Dados Abertos WMTS"
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -27455,7 +27539,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "Estradas Florestais dos E.U.A."
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -27463,13 +27547,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)"
@@ -27556,7 +27640,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 ""
@@ -27564,7 +27655,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"
@@ -27579,6 +27670,12 @@ msgstr "Ucrânia - Kyev 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 histórico"
 
@@ -28601,49 +28698,37 @@ msgstr "{0} deve ser um número inteiro entre -5 e 5"
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr "{0} deve ter apenas números com incrementos de .5 opcionalmente"
 
+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"
-msgstr "{0}: medida por defeito em metros; o separador deve ser um ponto"
+"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 ""
-"{0}: por padrão em toneladas; ponto para separador; para unidades colocar "
-"espaço e depois a unidade"
 
-msgid "unusual {0} format"
-msgstr "formato {0} incomum"
+msgid "unusual value of {0}"
+msgstr "valor incomum de  {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}: por padrão em quilómetros; ponto para separador; para unidades colocar "
-"espaço e depois a unidade"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 "a voltagem deve estar em volts sem unidades, delimitadores ou espaços"
 
-msgid "unusual {0} specification"
-msgstr "especificação {0} incomum"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "bitola ferroviária; utilize em mm sem separador"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr ""
-"inclinação incomum; utilize em percentagem/graus ou up/down (cima/baixo)"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} tem de ser um número"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} tem de ser um número inteiro positivo"
 
-msgid "unusual value of {0}"
-msgstr "valor incomum de  {0}"
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 "{0} tem de ser um valor numérico, em metros e sem a unidade de medida"
@@ -28758,6 +28843,9 @@ msgstr "Esconder ícones em aproximações de vista baixas"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Símbolos de nós menos obstrutivos em aproximações de vista baixas"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Mostrar nomes das vias (em níveis de aproximação de vista altos)"
 
@@ -28812,6 +28900,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."
@@ -28854,6 +28945,9 @@ msgstr ""
 "Fornece uma linha de comandos e permite a criação de comandos. Ver o link "
 "para comandos padrão (arc, cicle, etc.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -28913,6 +29007,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Gestão de EPCIs franceses (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Utilizar scripts externos no JOSM"
 
@@ -29145,6 +29244,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr "Permite abrir ficheiros GPX/OSM que passem pela área visível atual"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -30053,563 +30155,6 @@ msgstr "Importar imagem geo-referenciada"
 msgid "Error while creating image layer: "
 msgstr "Ocorreu um erro ao criar a camada de imagem: "
 
-msgid "Mapillary Images"
-msgstr "Imagens Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Camada Mapillary"
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr "{0} sequências, cada uma contendo entre {1} e {2} imagens (ø {3})"
-
-msgid "{0} imported images"
-msgstr "{0} imagens importadas"
-
-msgid "{0} downloaded images"
-msgstr "{0} imagens descarregadas"
-
-msgid "{0} images in total"
-msgstr "{0} de imagens no total"
-
-msgid "{0} images in {1} sequences"
-msgstr "{0} imagens em {1} sequências"
-
-msgid "Mapillary object layer"
-msgstr "Camada de objetos Mapillary"
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr "Mostra a camada com os objetos do mapa detetados pelo Mapillary"
-
-msgid "Open Mapillary layer"
-msgstr "Abrir camada Mapillary"
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Download Mapillary images in current view"
-msgstr "Descarrregar imagens Mapillary na vista atual"
-
-msgid "Export pictures"
-msgstr "Exportar imagens"
-
-msgid "Export Mapillary pictures"
-msgstr "Exportar imagens Mapillary"
-
-msgid "Export images"
-msgstr "Exportar imagens"
-
-msgid "Import pictures"
-msgstr "Importar imagens"
-
-msgid "Import local pictures"
-msgstr "Importar imagens locais"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Importar imagens para a camada Mapillary"
-
-msgid "Join mode"
-msgstr "Modo de unir"
-
-msgid "Join/unjoin pictures"
-msgstr "Unir/Separar imagens"
-
-msgid "Submit changeset"
-msgstr "Enviar conjunto de alterações"
-
-msgid "Submit the current changeset"
-msgstr "Enviar conjunto de alterações atual"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "Enviar conjunto de alterações atual para o Mapillary"
-
-msgid "rejected"
-msgstr "regeitado"
-
-msgid "pending"
-msgstr "pendente"
-
-msgid "approved"
-msgstr "aprovado"
-
-msgid "{0} images submitted, Changeset key: {1}, State: {2}"
-msgstr ""
-"{0} imagens submetidas, Chave do Conjunto de Alterações: {1}, Estado: {2}"
-
-msgid "Changeset upload failed with {0} error ''{1} {2}''!"
-msgstr "O envio do conjunto de alterações falhou com {0} erro ''{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 "Enviar imagens Mapillary"
-
-msgid "Walk mode"
-msgstr "Modo a pé"
-
-msgid "Zoom to selected image"
-msgstr "Aproximar a imagem selecionada"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Ver de perto a imagem Mapillary atualmente selecionada"
-
-msgid "Current Mapillary changeset"
-msgstr "Conjunto de alterações Mapillary atual"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Abrir painel de  conjunto de alterações Mapillary"
-
-msgid "Mapillary changeset"
-msgstr "Conjunto de alterações Mapillary"
-
-msgid "Submitting changeset to server…"
-msgstr "A enviar o conjunto de alterações para o servidor..."
-
-msgid "Export all images"
-msgstr "Exportar todas as imagens"
-
-msgid "Export selected sequence"
-msgstr "Exportar sequência selecionada"
-
-msgid "Export selected images"
-msgstr "Exportar imagens selecionadas"
-
-msgid "Rewrite imported images"
-msgstr "Tornar a gravar as imagens importadas"
-
-msgid "Select a directory"
-msgstr "Selecionar diretório"
-
-msgid "Explore"
-msgstr "Explorar"
-
-msgid "Speed limit"
-msgstr "Limite de velocidade"
-
-msgid "Give way"
-msgstr "Cedência de passagem"
-
-msgid "No entry"
-msgstr "Sentido proibido"
-
-msgid "Intersection danger"
-msgstr "Cruzamento"
-
-msgid "Mandatory direction (any)"
-msgstr "Sentido obrigatório"
-
-msgid "Uneven road"
-msgstr "Lomba"
-
-msgid "No parking"
-msgstr "Estacionamento proibido"
-
-msgid "No overtaking"
-msgstr "Ultrapassagem proibida"
-
-msgid "Pedestrian crossing"
-msgstr "Passadeira"
-
-msgid "No turn"
-msgstr "Proibido virar"
-
-msgid "Years"
-msgstr "Anos"
-
-msgid "Months"
-msgstr "Meses"
-
-msgid "Days"
-msgstr "Dias"
-
-msgid "Imported images"
-msgstr "Imagens importadas"
-
-msgid "Mapillary filter"
-msgstr "Filtro Mapillary"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Abrir janela de filtro Mapillary"
-
-msgid "Not older than: "
-msgstr "Não mais antigas que: "
-
-msgid "Downloaded images"
-msgstr "Imagens descarregadas"
-
-msgid "Only images with signs"
-msgstr "Apenas imagens com sinais"
-
-msgid "Choose signs"
-msgstr "Escolher sinais"
-
-msgid "Mapillary history"
-msgstr "Histórico Mapillary"
-
-msgid "Open Mapillary history dialog"
-msgstr "Abrir janela do histórico Mapillary"
-
-msgid "No image selected"
-msgstr "Nenhuma imagem selecionada"
-
-msgid "Press \"{0}\" to download images"
-msgstr "Carregue em \"{0}\" para descarregar as imagens"
-
-msgid "Mapillary picture"
-msgstr "Imagem Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Abrir janela Mapillary"
-
-msgid "Next picture"
-msgstr "Imagem seguinte"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Mostra a próxima imagem na sequência de imagens"
-
-msgid "Previous picture"
-msgstr "Imagem anterior"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Mostra a imagem anterior na sequência de imagens"
-
-msgid "Jump to red"
-msgstr "Ir para o vermelho"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Mostra a imagem na extremidade da linha vermelha"
-
-msgid "Jump to blue"
-msgstr "Ir para o azul"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Mostra a imagem na extremidade da linha azul"
-
-msgid "Stops the walk."
-msgstr "Pára o modo a pé."
-
-msgid "Play"
-msgstr "Iniciar"
-
-msgid "Continues with the paused walk."
-msgstr "Continua o modo a pé."
-
-msgid "Pause"
-msgstr "Pausa"
-
-msgid "Pauses the walk."
-msgstr "Pausa o modo a pé"
-
-msgid "Display hour when the picture was taken"
-msgstr "Mostrar a hora a que a fotografia foi tirada"
-
-msgid "Use 24 hour format"
-msgstr "Usar formato 24 horas"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr "Ver a localização da imagem seguinte com os botões seguinte/anterior"
-
-msgid "Preview images when hovering its icon"
-msgstr "Pré-visualizar imagens ao passar com o cursor sobre o ícone"
-
-msgid "Cut off sequences at download bounds"
-msgstr "Cortar sequências nos limites do descarregamento"
-
-msgid ""
-"When opening Mapillary image in web browser, show the blur editor instead of "
-"the image viewer"
-msgstr ""
-"Ao abrir a imagem Mapillary no navegador de Internet, mostrar o editor de "
-"desfocagem em vez do visualizador de imagens"
-
-msgid "Enable experimental beta-features (might be unstable)"
-msgstr "Ativar funcionalidades experimentais beta (pode ser instável)"
-
-msgid "Download mode"
-msgstr "Modo de descarregamento"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr "Número de imagens a serem pré-carregadas (anteriores e seguintes)"
-
-msgid "You are logged in as ''{0}''."
-msgstr "Está autenticado como ''{0}''."
-
-msgid "You are currently not logged in."
-msgstr "Neste momento não está autenticado."
-
-msgid "Login"
-msgstr "Iniciar sessão"
-
-msgid "Logout"
-msgstr "Terminar sessão"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-"Vá às preferências e autentique-se no Mapillary antes de enviar dados."
-
-msgid "Upload selected sequence"
-msgstr "Enviar sequência selecionada"
-
-msgid "Delete after upload"
-msgstr "Eliminar após o envio"
-
-msgid "Wait for full quality pictures"
-msgstr "Esperar pelas imagens em alta qualidade"
-
-msgid "Follow selected image"
-msgstr "Seguir a imagem selecionada"
-
-msgid "Go forward"
-msgstr "Avançar"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr "Que camadas de imagens quer importar para a camada Mapillary?"
-
-msgid "Import"
-msgstr "Importar"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-"Não foi possível importar a imagem geo-referenciada para a camada Mapillary!"
-
-msgid "{0} ({1} images)"
-msgstr "{0} ({1} imagens)"
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr "De que fontes quer importar as imagens para a camada Mapillary?"
-
-msgid "There are currently no layers with geotagged images!"
-msgstr "Não existem neste momento camadas com imagens geo-referenciadas!"
-
-msgid "Images from my file system"
-msgstr "Imagens do meu computador"
-
-msgid "Select the images you want to import"
-msgstr "Selecione as imagens que quer importar"
-
-msgid "All images in a directory"
-msgstr "Todas as imagens de uma pasta"
-
-msgid "Select directory to import images from"
-msgstr "Selecione a pasta com imagens a importar"
-
-msgid "From existing image layer"
-msgstr "Da camada de imagens existente"
-
-msgid "Import exception"
-msgstr "Erro de importação"
-
-msgid "Could not import the image ''{0}''!"
-msgstr "Não foi possível importar a imagem ''{0}''!"
-
-msgid "Could not import the directory ''{0}''!"
-msgstr "Não foi possível importar a pasta ''{0}''!"
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr ""
-"A etiqueta com a chave <i>{0}</i> já existe no objeto do OSM selecionado."
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-"Quer mesmo substituir o valor atual <i>{0}</i> com o novo valor <i>{1}</i>?"
-
-msgid "Tag conflict"
-msgstr "Conflito de etiquetas"
-
-msgid "Key copied to clipboard"
-msgstr "Chave copiada para a área de transferência"
-
-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 "Entendido, fechar isto."
-
-msgid "Image info"
-msgstr "Informações da imagem"
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr ""
-"Mostra informação detalhada sobre a imagem atual selecionada do Mapillary"
-
-msgid "Show detections on top of image"
-msgstr "Mostrar deteções por cima da imagem"
-
-msgid "View in browser"
-msgstr "Ver no navegador"
-
-msgid "Copy key"
-msgstr "Copiar chave"
-
-msgid "Add Mapillary tag"
-msgstr "Adicionar etiqueta Mapillary"
-
-msgid "Image detections"
-msgstr "Deteções de imagem"
-
-msgid "Image actions"
-msgstr "Ações de imagem"
-
-msgid "Image key"
-msgstr "Chave da imagem"
-
-msgid "Sequence key"
-msgstr "Chave da sequência"
-
-msgid "{0} detections"
-msgstr "{0} deteções"
-
-msgid "image has no key"
-msgstr "A imagem não tem chave"
-
-msgid "unknown user"
-msgstr "utilizador desconhecido"
-
-msgid "sequence has no key"
-msgstr "a sequência não tem chave"
-
-msgid "Could not open the URL {0} in a browser"
-msgstr "Não foi possível abrir o URL {0} no navegador de internet"
-
-msgid "Downloading map objects…"
-msgstr "A descarregar objetos do mapa..."
-
-msgid "All map objects loaded."
-msgstr "Todos os objetos do mapa carregados."
-
-msgid "Too many map objects, zoom in to see all."
-msgstr "Demasiados objetos, aproxime para os ver a todos."
-
-msgid "Downloading map objects failed!"
-msgstr "Não foi possível descarregar objetos do mapa!"
-
-msgid "Mapillary objects"
-msgstr "Objetos Mapillary"
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] "{0} imagem eliminada"
-msgstr[1] "{0} imagens eliminadas"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "{0} imagem importadas"
-msgstr[1] "{0} imagens importadas"
-
-msgid "2 images joined"
-msgstr "2 imagens unidas"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "Movida {0} imagem"
-msgstr[1] "Movidas {0} imagens"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "Virada {0} imagem"
-msgstr[1] "Viradas {0} imagens"
-
-msgid "2 images unjoined"
-msgstr "2 imagens separadas"
-
-msgid "Could not read from URL {0}!"
-msgstr "Não foi possível ler do URL {0}!"
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-"{0}\n"
-"Não foi possível ler os objetos do mapa do URL\n"
-"{1}!"
-
-msgid "everything in the visible area"
-msgstr "tudo na área visível"
-
-msgid "areas with downloaded OSM-data"
-msgstr "áreas com dados descarregados do OSM"
-
-msgid "only when manually requested"
-msgstr "apenas quando pedido manualmente"
-
-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 "A descarregar"
-
-msgid "Select mode"
-msgstr "Modo de seleção"
-
-msgid "Mapillary login"
-msgstr "Autenticação Mapillary"
-
-msgid "Login successful, return to JOSM."
-msgstr "Autenticação bem sucedida, retorne ao JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Formatos de imagem suportados (JPG e PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "A descarregar imagens Mapillary"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Total de imagens Mapillary: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr "Enviar Conjunto de Alterações Mapillary"
-
-msgid "No images found"
-msgstr "Nenhuma imagem encontrada"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr "Enviou com sucesso {0} imagens para mapillary.com"
-
-msgid "Finished upload"
-msgstr "Envio terminado"
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr ""
-"Não está autenticado, por favor entre na sua conta do Mapillary nas "
-"preferências"
-
-msgid "Not Logged in to Mapillary"
-msgstr "Não autenticado no Mapillary"
-
-msgid "Uploading: {0}"
-msgstr "A enviar: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -31423,6 +30968,112 @@ msgstr "Não foi encontrado um endereço para este objeto."
 msgid "An unexpected exception occurred:"
 msgstr "Ocorreu um erro de exceção inesperado:"
 
+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 ferramenta apenas pode substituir um nó por outro nó, um nó por uma "
+"linha ou multi-polígono, ou uma linha por outra linha."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr ""
+"O nó a substituir pertence a uma ou várias linhas. Não é possível substituir."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr "A relação não é um multi-polígono por isso não pode ser substituída."
+
+msgid "Replace geometry for node {0}"
+msgstr "Substituição da geometria do nó {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Só se pode utilizar a ferramenta de substituir geometria selecionando um "
+"objeto já existente no OpenStreetMap e outro novo."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "As linhas devem estar completamente dentro da área descarregada."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"A linha a ser substituída não pode ter nenhum nó com etiquetas nem pertencer "
+"a relações (a não ser que ambas as linhas pertençam às mesmas relações)."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"O limite de interação do método robusto foi excedido. A usar método simples."
+
+msgid "Replace geometry for way {0}"
+msgstr "Substituída geometria da linha {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Foram adicionadas demasiadas linhas: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -31458,9 +31109,30 @@ msgstr "Etiquetas de edifícios:"
 msgid "Cannot place building outside of the world."
 msgstr "Não é possível colocar edifícios fora do mundo."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Criar edifício"
 
+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 "Opções da ferramenta de edifícios"
 
@@ -31475,8 +31147,17 @@ msgstr ""
 "Se desenhar um edifício sobre um nó com etiquetas adequadas, eliminá-lo e "
 "importar as etiquetas"
 
-msgid "Buildings width:"
-msgstr "Largura dos edifícios:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Incremento 1º lado"
@@ -32227,6 +31908,18 @@ msgstr "Eliminar o esquema de cores da lista."
 msgid "Color Schemes"
 msgstr "Esquema de Cores"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Abortar a edição de etiquetas e fechar a janela"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Aplicar etiquetas editadas e fechar a janela"
+
 msgid "Conflation"
 msgstr "Fusão de dados"
 
@@ -32738,6 +32431,9 @@ msgstr "Aprir o painel GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Aproxime o enquadramento para ver mensagens"
 
+msgid "Login"
+msgstr "Iniciar sessão"
+
 msgid "Enable autologin"
 msgstr "Ativar início de sessão automático"
 
@@ -32770,24 +32466,15 @@ msgstr "Conversação privada"
 msgid "Close tab"
 msgstr "Fechar aba"
 
+msgid "Logout"
+msgstr "Terminar sessão"
+
 msgid "Clear log"
 msgstr "Limpar registo"
 
 msgid "Show users on map"
 msgstr "Mostrar utilizadores no mapa"
 
-msgid "GeoJSON file"
-msgstr "Ficheiro GeoJSON"
-
-msgid "Loading json file..."
-msgstr "A carregar ficheiro JSON..."
-
-msgid "Data Layer from GeoJSON: "
-msgstr "Camada de dados do GeoJSON: "
-
-msgid "Error loading geojson file {0}"
-msgstr "Ocorreu um erro ao carregar o ficheiro GeoJSON {0}"
-
 msgid "Position only"
 msgstr "Apenas posição"
 
@@ -32877,6 +32564,9 @@ msgstr "Importar Globalsat"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importar dados do Globalsat Datalogger DG100 para uma camada GPX."
 
+msgid "Import"
+msgstr "Importar"
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -33631,7 +33321,25 @@ msgstr "Tipo de estrutura:"
 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"
@@ -33664,31 +33372,92 @@ msgstr ""
 msgid "Apply Tags"
 msgstr "Aplicar Etiquetas"
 
-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 "Level Selection"
+msgid "Example: ''2'' or ''3''"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Insert level"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Add a new level to layer."
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+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"
@@ -34875,6 +34644,27 @@ msgstr "Extensão de ficheiro desconhecida: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Falhou o processamento do ficheiro \"{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"
 
@@ -35215,6 +35005,9 @@ msgstr "Editar Dados GPS da Imagem"
 msgid "Please select an image first."
 msgstr "Selecione primeiro uma imagem."
 
+msgid "No image selected"
+msgstr "Nenhuma imagem selecionada"
+
 msgid "(Empty values delete the according fields.)"
 msgstr "(Valores em branco eliminarão os campos relacionados.)"
 
@@ -35964,6 +35757,9 @@ msgstr "implícito"
 msgid "State"
 msgstr "Estado"
 
+msgid "pending"
+msgstr "pendente"
+
 msgid "[incomplete]"
 msgstr "[incompleto]"
 
@@ -36398,12 +36194,6 @@ msgstr ""
 "Não foi encontrada a preferência ''{0}''. Não é possível inicializar o "
 "SdsApi."
 
-msgid "Failed to open connection to API {0}."
-msgstr "Não foi possível abrir a ligação à API {0}."
-
-msgid "Proxy Authentication Required"
-msgstr "Necessária Autenticação 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>"
@@ -36772,12 +36562,6 @@ msgstr "Módulo de Edição de Etiquetas do JOSM"
 msgid "Presets"
 msgstr "Modelos de Etiquetas"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Abortar a edição de etiquetas e fechar a janela"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Aplicar etiquetas editadas e fechar a janela"
-
 msgid "Highlight"
 msgstr "Destacar"
 
@@ -38518,47 +38302,6 @@ msgstr ""
 "Esta ferramenta substitui a geometria de um objeto pela geometria de outro, "
 "por isso é necessário selecionar dois objetos."
 
-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 ferramenta apenas pode substituir um nó por outro nó, um nó por uma "
-"linha ou multi-polígono, ou uma linha por outra linha."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr ""
-"O nó a substituir pertence a uma ou várias linhas. Não é possível substituir."
-
-msgid "Replace geometry for node {0}"
-msgstr "Substituição da geometria do nó {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr "A relação não é um multi-polígono por isso não pode ser substituída."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Só se pode utilizar a ferramenta de substituir geometria selecionando um "
-"objeto já existente no OpenStreetMap e outro novo."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "As linhas devem estar completamente dentro da área descarregada."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"A linha a ser substituída não pode ter nenhum nó com etiquetas nem pertencer "
-"a relações (a não ser que ambas as linhas pertençam às mesmas relações)."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"O limite de interação do método robusto foi excedido. A usar método simples."
-
-msgid "Replace geometry for way {0}"
-msgstr "Substituída geometria da linha {0}"
-
 msgid "Replace Membership"
 msgstr "Substituir Pertença a Relações"
 
@@ -38642,9 +38385,6 @@ msgstr "Seleciona os nós do meio de uma linha"
 msgid "Please select two nodes connected by way!"
 msgstr "Selecione 2 nós de uma linha!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Foram adicionadas demasiadas linhas: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Tudo dentro de uma linha fechada [em teste]"
 
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index 7dbd6c4..9331e64 100644
--- a/i18n/po/pt_BR.po
+++ b/i18n/po/pt_BR.po
@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-30 04:32+0000\n"
-"Last-Translator: André Marcelo Alvarenga <andrealvarenga at gmx.net>\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-27 14:41+0000\n"
+"Last-Translator: Nelson A. de Oliveira <naoliv at debian.org>\n"
 "Language-Team: Português Brasileiro <gnome-pt_br-list at gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:07+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: pt_BR\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1034,8 +1034,8 @@ msgstr "Digitar URL para baixar:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Digite a URL de onde os dados devem ser baixados"
 
-msgid "Separate Layer"
-msgstr "Separar camadas"
+msgid "Download as new layer"
+msgstr "Baixar como nova camada"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Indique se os dados devem ser baixados em uma nova camada"
@@ -2458,12 +2458,12 @@ msgstr "Converte para uma camada GPX iniciando no último membro"
 
 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"
@@ -3395,7 +3395,7 @@ msgid "Update imagery ''{0}''"
 msgstr "Atualizar imagens \"{0}\""
 
 msgid "Drop old imagery ''{0}''"
-msgstr ""
+msgstr "Projetar imagens antigas ''{0}''"
 
 msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
 msgstr "Projeção ''{0}'' não foi encontrada, marcador ''{1}'' não é usável"
@@ -5191,7 +5191,8 @@ msgid "Authentication Failed"
 msgstr "Autenticação Falhou"
 
 msgid "Access to redacted version ''{0}'' of {1} {2} is forbidden."
-msgstr "É proibido o acesso a versão editada ''{0}'' do {1} {2}."
+msgstr ""
+"Acesso à versão redigida (redacted) ''{0}'' do {1} {2} está proibida."
 
 msgid "Authorisation Failed"
 msgstr "Autorização Falhou"
@@ -8281,7 +8282,7 @@ msgid "Delete from relation"
 msgstr "Deletar da relação"
 
 msgid "Really delete selection from relation {0}?"
-msgstr "Confirmar a exclusão da relação {0}?"
+msgstr "A seleção deve realmente ser excluída da relação {0}?"
 
 msgid "Add a new key/value pair to all objects"
 msgstr "Adicionar um novo par chave/valor para todos objetos"
@@ -8982,9 +8983,6 @@ msgstr "Requerido valor de latitude no intervalo [-90,90]."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Requerido valor de longitude no intervalo [-180,180]."
 
-msgid "Download as new layer"
-msgstr "Baixar como nova camada"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10657,6 +10655,9 @@ msgstr "Não foram encontrados dados no arquivo ''{0}''."
 msgid "Open OSM file"
 msgstr "Abrir arquivo OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr "Arquivos da Validação de Erros"
 
@@ -11818,19 +11819,22 @@ msgstr "O argumento {0} foi fornecido, era esperado {1} ou {2}"
 
 msgid "{0} mode, but no bounds found in osm data input file"
 msgstr ""
+"Modo {0}, mas não foram encontrados limites no arquivo osm de entrada"
 
 msgid ""
 "Unable to determine scale, one of the options {0}, {1}, {2} or {3} expected"
 msgstr ""
+"Incapaz de determinar a escala, uma das opções {0}, {1}, {2} ou {3} é "
+"esperada"
 
 msgid "Missing argument - input data file ({0})"
-msgstr ""
+msgstr "Argumento ausente - arquivo de dados de entrada ({0})"
 
 msgid "In .osm data file ''{0}'' - "
-msgstr ""
+msgstr "No arquivo de dados .osm ''{0}'' - "
 
 msgid "Missing argument - at least one style expected ({0})"
-msgstr ""
+msgstr "Argumento ausente - pelo menos um estilo é esperado ({0})"
 
 msgid ""
 "Image dimensions ({0}x{1}) exceeds maximum image size {2} (use option {3} to "
@@ -11840,7 +11844,7 @@ msgstr ""
 "a opção {3} para alterar o limite)"
 
 msgid "Style setting not found: ''{0}''"
-msgstr ""
+msgstr "Configuração de estilo não encontrada: ''{0}''"
 
 msgid ""
 "There was an error when loading this style. Select ''Info'' from the right "
@@ -12817,7 +12821,7 @@ msgid "Draw segment order numbers"
 msgstr "Desenhar número de sequência dos segmentos"
 
 msgid "Draw segment order numbers on selected way"
-msgstr ""
+msgstr "Desenhe os números ordenados do segmento no caminho selecionado"
 
 msgid "Draw boundaries of downloaded data"
 msgstr "Desenhar os limites dos dados recebidos"
@@ -12908,6 +12912,8 @@ msgstr ""
 msgid ""
 "Display buttons to automatically filter numeric values of a predefined tag"
 msgstr ""
+"Exibir botões para filtrar automaticamente os valores numéricos de uma "
+"etiqueta predefinida"
 
 msgid "Options that affect drawing performance"
 msgstr "Opções que afetam o desempenho de desenho"
@@ -13156,13 +13162,13 @@ msgid "Track and Point Coloring"
 msgstr "Coloração de caminhos e pontos"
 
 msgid "Overlay gain adjustment"
-msgstr ""
+msgstr "Ajuste de ganho de sobreposição"
 
 msgid "Lower limit of visibility"
 msgstr "Limite inferior de visibilidade"
 
 msgid "Adjust the gain of overlay blending."
-msgstr ""
+msgstr "Ajusta o ganho da combinação na sobreposição"
 
 msgid "Draw all GPX traces that exceed this threshold."
 msgstr "Desenhar todas as trilhas GPX que excedem este limite"
@@ -13170,6 +13176,8 @@ msgstr "Desenhar todas as trilhas GPX que excedem este limite"
 msgid ""
 "Render engine uses points with simulated position error instead of lines. "
 msgstr ""
+"O motor de renderização usa pontos com erros da posição simulada ao invés de "
+"linhas. "
 
 msgid "Colors points and track segments by data limits."
 msgstr "Pontos de cores e segmentos de pista por limites de dados."
@@ -13257,9 +13265,11 @@ msgid ""
 "Divide intervals between native resolution levels to smaller steps if they "
 "are much larger than zoom ratio"
 msgstr ""
+"Divide os intervalos entre os níveis de resolução nativos para etapas "
+"menores caso sejam muito maiores que a taxa de zoom"
 
 msgid "Zoom steps to get double scale"
-msgstr ""
+msgstr "Etapas de zoom para obter uma dupla escala"
 
 msgid ""
 "Higher value means more steps needed, therefore zoom steps will be smaller"
@@ -13784,15 +13794,18 @@ msgstr "Liste os plugins que deseja fazer o download."
 msgid ""
 "You should add one plugin id per line, version information is ignored."
 msgstr ""
+"Você deve adicionar um id de plugin por linha, a informação de versão é "
+"ignorada."
 
 msgid "You can copy+paste the list of a status report here."
-msgstr ""
+msgstr "Você pode copiar e colar a lista do relatório de status aqui."
 
 msgid "Load plugins from list"
 msgstr "Carregar plugins a partir da lista"
 
 msgid "The following plugins were not found. Continue anyway?"
 msgstr ""
+"Os seguintes plugins não foram encontrados. Continuar de qualquer modo?"
 
 msgid "Add JOSM Plugin description URL."
 msgstr "Adicione a URL descritiva do Plugin do JOSM."
@@ -13956,7 +13969,7 @@ msgid "Default projection"
 msgstr "Projeção padrão"
 
 msgid "Default projection has been set to ''{0}''"
-msgstr ""
+msgstr "A projeção padrão foi configurada para ''{0}''"
 
 msgid "Display coordinates as"
 msgstr "Mostra coordenadas como"
@@ -14027,9 +14040,6 @@ msgstr "Controle Remoto"
 msgid "Settings for the remote control feature."
 msgstr "Configurações do recurso de controle remoto."
 
-msgid "Download objects to new layer"
-msgstr "Baixar objetos para uma nova camada"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Confirmar todas as ações do Controle Remoto manualmente"
 
@@ -14858,9 +14868,11 @@ msgid ""
 "Error adding certificate {0} - certificate fingerprint mismatch. Expected "
 "{1}, was {2}"
 msgstr ""
+"Erro ao adicionar o certificado {0} - as digitais do certificado são "
+"incompatíveis. Esperava-se {1}, era {2}"
 
 msgid "Adding certificate for TLS connections: {0}"
-msgstr ""
+msgstr "Adicionando o certificado para as conexões TLS: {0}"
 
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr "Falhou ao analisar data ''{0}'' respondido pelo servidor."
@@ -15160,11 +15172,16 @@ msgid ""
 "Missing mandatory attributes on element ''bounds''. Got "
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', origin=''{4}''."
 msgstr ""
+"Não foram encontrados atributos obrigatórios no elemento \"bounds\". Obteve-"
+"se minlon=''{0}'',minlat=''{1}'',maxlon=''{2}'',maxlat=''{3}'', "
+"origin=''{4}''."
 
 msgid ""
 "Illegal value for attributes ''lat'', ''lon'' on node with ID {0}. Got "
 "''{1}'', ''{2}''."
 msgstr ""
+"Valores ilegais nos atributos \"lat\", \"lon\" do nó com ID {0}. Obteve-se "
+"''{1}'', ''{2}''."
 
 msgid "Deleted way {0} contains nodes"
 msgstr "Via {0} excluída contem nós"
@@ -15356,7 +15373,7 @@ msgid "Unexpected id 0 for osm primitive found"
 msgstr "ID 0 inesperado para o primitivo osm encontrado"
 
 msgid "Failed to evaluate {0}"
-msgstr ""
+msgstr "Falha ao avaliar {0}"
 
 msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
 msgstr "Valor inesperado para a chave ''{0}'' nas preferências, tem ''{1} ''"
@@ -15541,10 +15558,10 @@ msgid "Do you want to allow this?"
 msgstr "Você quer permitir isto?"
 
 msgid "Yes, always"
-msgstr ""
+msgstr "Sim, sempre"
 
 msgid "Yes, once"
-msgstr ""
+msgstr "Sim, uma vez"
 
 msgid "Confirm Remote Control action"
 msgstr "Confirmar ação do Controle remoto"
@@ -15628,6 +15645,8 @@ msgstr ""
 msgid ""
 "Version ''{0}'' of meta data for note layer is not supported. Expected: 0.1"
 msgstr ""
+"A versão ''{0}'' dos metadados para a camada de notas não é suportada. É "
+"esperado: 0.1"
 
 msgid ""
 "Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
@@ -15940,6 +15959,12 @@ msgstr "Manter plugin"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Clique para apagar o plugin ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Falha na instalação do plugin ''{0}'', do arquivo de download temporário "
+"''{1}''. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Falha ao excluir o plugin desatualizado ''{0}''."
 
@@ -15951,12 +15976,6 @@ msgstr ""
 "JOSM irá carregar a versão antiga do plugin."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Falha na instalação do plugin ''{0}'', do arquivo de download temporário "
-"''{1}''. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -17035,7 +17054,7 @@ msgid "sett"
 msgstr "paralelepípedo"
 
 msgid "cobblestone"
-msgstr "piso de seixos"
+msgstr "pavimento de pedras irregulares"
 
 msgid "grass_paver"
 msgstr "pisograma"
@@ -17959,10 +17978,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "na cobertura"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "kiosk"
-
 msgid "Start date"
 msgstr "Data de início"
 
@@ -19293,7 +19308,7 @@ msgid "swamp"
 msgstr "pântano"
 
 msgid "bog"
-msgstr "atoleiro"
+msgstr "paul"
 
 msgid "marsh"
 msgstr "brejo"
@@ -19314,7 +19329,7 @@ msgid "wet_meadow"
 msgstr "campo alagável"
 
 msgid "string_bog"
-msgstr ""
+msgstr "cordões pantanosos"
 
 msgid "saltern"
 msgstr "salina"
@@ -19475,14 +19490,17 @@ msgstr "Biodiesel"
 msgid "Octane 80"
 msgstr "Octano 80"
 
+msgid "Octane 87"
+msgstr "Octano 87 (gasolina comum/aditivada)"
+
 msgid "Octane 91"
-msgstr "Octano 91"
+msgstr "Octano 91 (gasolina premium)"
 
 msgid "Octane 92"
 msgstr "Octano 92"
 
 msgid "Octane 95"
-msgstr "Octano 95"
+msgstr "Octano 95 (gasolina Podium/Octapro)"
 
 msgid "Octane 98"
 msgstr "Octano 98"
@@ -19496,6 +19514,9 @@ msgstr "E10 (10% de mistura de etanol)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% de mistura de etanol)"
 
+msgid "Ethanol (alcohol)"
+msgstr "Etanol (álcool)"
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Gás de petróleo liquefeito)"
 
@@ -19840,7 +19861,7 @@ msgid "CHAdeMO"
 msgstr ""
 
 msgid "Tesla Supercharger"
-msgstr ""
+msgstr "Tesla Supercharger"
 
 msgid "Schuko"
 msgstr ""
@@ -22154,6 +22175,12 @@ msgstr "Chafariz"
 msgid "Water Well"
 msgstr "Poço Artesiano"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Farol"
 
@@ -23207,7 +23234,7 @@ msgstr "sarcófago"
 
 msgctxt "tomb"
 msgid "vault"
-msgstr ""
+msgstr "câmara funerária"
 
 msgid "Monument"
 msgstr "Monumento"
@@ -25247,7 +25274,7 @@ msgid "Public GPS traces uploaded to OpenStreetMap."
 msgstr "Trilhas GPS públicas enviadas ao OpenStreetMap."
 
 msgid "OpenTopoMap"
-msgstr ""
+msgstr "OpenTopoMap"
 
 msgid "Public Transport (ÖPNV)"
 msgstr "Transportes Públicos (ÖPNV)"
@@ -25263,6 +25290,39 @@ msgstr ""
 "Imagens de sobreposição para o mapeamento de pistas no OSM. Atualizado "
 "diariamente."
 
+msgid "OpenRailwayMap"
+msgstr "OpenRailwayMap"
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr "Sobreposição de imagens para o mapeamento ferroviário no OSM"
+
+msgid "OpenInfraMap Telecoms"
+msgstr "OpenInfraMap Telecomunicações"
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Sobreposição de imagens para o mapeamento da infraestrutura de "
+"telecomunicação no OSM. Atualizado diariamente."
+
+msgid "OpenInfraMap Power"
+msgstr "OpenInfraMap Energia"
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Sobreposição de imagens para o mapeamento da infraestrutura energética no "
+"OSM. Atualizado diariamente."
+
+msgid "OpenInfraMap Petroleum"
+msgstr "OpenInfraMap Petróleo"
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Sobreposição de imagens para o mapeamento da infraestrutura petrolífera no "
+"OSM. Atualizado diariamente."
+
 msgid "skobbler"
 msgstr "skobbler"
 
@@ -25294,7 +25354,7 @@ msgid "Locator Overlay"
 msgstr "Locator Overlay"
 
 msgid "Shows major features to help orient you."
-msgstr ""
+msgstr "Exibe os principais recursos para auxiliar sua orientação"
 
 msgid "QA No Address"
 msgstr "QA No Address"
@@ -25344,190 +25404,220 @@ msgstr "OSM Inspector: Endereços"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM Inspector: Linha costeira (UE)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr ""
+msgid "imagico.de: Prokletije Mountains"
+msgstr "imagico.de: Montes Prokletije"
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
 "snow (true color)"
 msgstr ""
+"Imagens do final do verão, quando as demais fontes são severamente limitadas "
+"por nuvens e neve (cor verdadeira)"
 
 msgid "Municipality of Tirana (Open Labs GeoPortal)"
-msgstr ""
+msgstr "Município de Tirana (Open Labs Geoportal)"
 
 msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
+"Ruas e Edifícios providos pelo Município de Tirana. Hospedado pelo Open Labs"
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
-msgstr ""
+msgid "imagico.de: Southern Transantarctic Mountains"
+msgstr "imagico.de: Montes Transantárticos do Sul"
 
 msgid ""
 "Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
 "(true color)"
 msgstr ""
+"Fora da cobertura regular do Landsat e portanto ausente em LIMA e "
+"Bing/Mapbox (cor verdadeira)"
+
+msgid "imagico.de: Pensacola Mountains"
+msgstr "imagico.de: Montes Pensacola"
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
+msgid "imagico.de: Elephant Island/Clarence Island"
+msgstr "imagico.de: Ilha Elefante/Ilha Clarence"
+
+msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
 msgstr ""
+"Imagem limpa e atualizada para o mapeamento das bordas de geleiras (cor "
+"verdadeira)"
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
+msgid "imagico.de: Bunger Hills"
 msgstr ""
 
-msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
+msgid ""
+"Largest ice free area at the East Antarctic coast - shows considerable "
+"amounts of non-permanent ice. (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+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: Terra de Enderby e Costa de Kemp"
+
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr ""
+"Imagens Sentinel-2 da Terra de Enderby e Costa de Kemp (cor verdadeira)"
 
-msgid "IGN topographical map (TMS)"
+msgid "imagico.de: Larsen C ice shelf after calving"
 msgstr ""
 
-msgid "IGN topographical map (WMTS)"
+msgid "For updating the ice edge after the 2017 iceberg calving (true color)"
 msgstr ""
 
+msgid "IGN topographical map (TMS)"
+msgstr "Mapa topográfico IGN (TMS)"
+
+msgid "IGN topographical map (WMTS)"
+msgstr "Mapa topográfico IGN (WMTS)"
+
 msgid "IGN topographical map (WMS)"
-msgstr ""
+msgstr "Mapa topográfico IGN (WMS)"
 
 msgid "IGN orthophoto AMBA a (WMTS)"
-msgstr ""
+msgstr "Ortofoto AMBA a IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA b (WMTS)"
-msgstr ""
+msgstr "Ortofoto AMBA b IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA c (WMTS)"
-msgstr ""
+msgstr "Ortofoto AMBA c IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA d (WMTS)"
-msgstr ""
+msgstr "Ortofoto AMBA d IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA e (WMTS)"
-msgstr ""
+msgstr "Ortofoto AMBA e IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA f (WMTS)"
-msgstr ""
+msgstr "Ortofoto AMBA f IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA 4 (WMTS)"
-msgstr ""
+msgstr "Ortofoto AMBA 4 IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA 5 (WMTS)"
-msgstr ""
+msgstr "Ortofoto AMBA 5 IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA 6 (WMTS)"
-msgstr ""
+msgstr "Ortofoto AMBA 6 IGN (WMTS)"
 
 msgid "IGN orthophoto AMBA 7 (WMTS)"
-msgstr ""
+msgstr "Ortofoto AMBA 7 IGN (WMTS)"
 
 msgid "IGN orthophoto Barranqueras (WMTS)"
-msgstr ""
+msgstr "Ortofoto Barranqueras IGN (WMTS)"
 
 msgid "IGN orthophoto Catamarca (WMTS)"
-msgstr ""
+msgstr "Ortofoto Catamarca IGN (WMTS)"
 
 msgid "IGN orthophoto Córdoba (WMTS)"
-msgstr ""
+msgstr "Ortofoto Córdoba IGN (WMTS)"
 
 msgid "IGN orthophoto El Calafate (WMTS)"
-msgstr ""
+msgstr "Ortofoto El Calafate IGN (WMTS)"
 
 msgid "IGN orthophoto El Rodeo (WMTS)"
-msgstr ""
+msgstr "Ortofoto El Rodeo IGN (WMTS)"
 
 msgid "IGN orthophoto Jujuy (WMTS)"
-msgstr ""
+msgstr "Ortofoto Jujuy IGN (WMTS)"
 
 msgid "IGN orthophoto La Rioja (WMTS)"
-msgstr ""
+msgstr "Ortofoto La Rioja IGN (WMTS)"
 
 msgid "IGN orthophoto Mendoza (WMTS)"
-msgstr ""
+msgstr "Ortofoto Mendoza IGN (WMTS)"
 
 msgid "IGN orthophoto Neuquén (WMTS)"
-msgstr ""
+msgstr "Ortofoto Neuquén IGN (WMTS)"
 
 msgid "IGN orthophoto Posadas (WMTS)"
-msgstr ""
+msgstr "Ortofoto Posadas IGN (WMTS)"
 
 msgid "IGN orthophoto Resistencia (WMTS)"
-msgstr ""
+msgstr "Ortofoto Resistencia IGN (WMTS)"
 
 msgid "IGN orthophoto Río Gallegos (WMTS)"
-msgstr ""
+msgstr "Ortofoto Rio Gallegos IGN (WMTS)"
 
 msgid "IGN orthophoto Río Grande (WMTS)"
-msgstr ""
+msgstr "Ortofoto Rio Grande IGN (WMTS)"
 
 msgid "IGN orthophoto Río Paraná A (WMTS)"
-msgstr ""
+msgstr "Ortofoto Rio Paraná A IGN (WMTS)"
 
 msgid "IGN orthophoto Río Paraná B (WMTS)"
-msgstr ""
+msgstr "Ortofoto Rio Paraná B IGN (WMTS)"
 
 msgid "IGN orthophoto Rosario (WMTS)"
-msgstr ""
+msgstr "Ortofoto Rosario IGN (WMTS)"
 
 msgid "IGN orthophoto Salta (WMTS)"
-msgstr ""
+msgstr "Ortofoto Salta IGN (WMTS)"
 
 msgid "IGN orthophoto Salta 1 (WMTS)"
-msgstr ""
+msgstr "Ortofoto Salta 1 IGN (WMTS)"
 
 msgid "IGN orthophoto Salta 2 (WMTS)"
-msgstr ""
+msgstr "Ortofoto Salta 2 IGN (WMTS)"
 
 msgid "IGN orthophoto Salta 3 (WMTS)"
-msgstr ""
+msgstr "Ortofoto Salta 3 IGN (WMTS)"
 
 msgid "IGN orthophoto Salta 4 (WMTS)"
-msgstr ""
+msgstr "Ortofoto Salta 5 IGN (WMTS)"
 
 msgid "IGN orthophoto Salto Grande (WMTS)"
-msgstr ""
+msgstr "Ortofoto Salto Grande IGN (WMTS)"
 
 msgid "IGN orthophoto San Juan (WMTS)"
-msgstr ""
+msgstr "Ortofoto San Juan IGN (WMTS)"
 
 msgid "IGN orthophoto San Luis (WMTS)"
-msgstr ""
+msgstr "Ortofoto San Luis IGN (WMTS)"
 
 msgid "IGN orthophoto Santa Cruz III (WMTS)"
-msgstr ""
+msgstr "Ortofoto Santa Cruz III IGN (WMTS)"
 
 msgid "IGN orthophoto Santa Cruz IV (WMTS)"
-msgstr ""
+msgstr "Ortofoto Santa Cruz IV IGN (WMTS)"
 
 msgid "IGN orthophoto Santa Cruz VI (WMTS)"
-msgstr ""
+msgstr "Ortofoto Santa Cruz VI IGN (WMTS)"
 
 msgid "IGN orthophoto Santa Fe and Paraná (WMTS)"
-msgstr ""
+msgstr "Ortofoto Santa Fe e Paraná IGN (WMTS)"
 
 msgid "IGN orthophoto Tucumán (WMTS)"
-msgstr ""
+msgstr "Ortofoto Tucumán IGN (WMTS)"
 
 msgid "IGN orthophoto Ushuaia (WMTS)"
-msgstr ""
+msgstr "Ortofoto Ushuaia IGN (WMTS)"
 
 msgid "Educational map (WMS)"
-msgstr ""
+msgstr "Mapa educacional (WMS)"
 
 msgid "Ministry of Agroindustry (WMS)"
-msgstr ""
+msgstr "Ministério da Agroindústria (WMS)"
 
 msgid "Ministry of Energy and Mining (WMS)"
-msgstr ""
+msgstr "Ministério de Minas e Energia (WMS)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
-msgstr ""
+msgid "imagico.de: Bahía Blanca (low tide)"
+msgstr "imagico.de: Bahía Blanca (maré baixa)"
 
 msgid "Tidal flats and islands at the coast (true color)"
-msgstr ""
+msgstr "Planícies de marés e ilhas costeiras (cor verdadeira)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
-msgstr ""
+msgid "imagico.de: Bahía Blanca (high tide)"
+msgstr "imagico.de: Bahía Blanca (maré alta)"
 
 msgid "AGRI black-and-white 2.5m"
 msgstr "AGRI black-and-white 2.5m"
@@ -25559,26 +25649,29 @@ msgstr "LPI NSW Administrative Boundaries State Forest"
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW Administrative Boundaries NPWS Reserve"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
-msgstr ""
+msgid "imagico.de: Northwest Heard Island"
+msgstr "imagico.de: Ilha Northwest Heard"
 
 msgid ""
 "Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
 msgstr ""
+"Glaciares da Ilha Northwest Heard (mapeados enquanto isso) (cor falsa IR)"
 
-msgid "imagico.de OSM images for mapping: Heard Island coast"
-msgstr ""
+msgid "imagico.de: Heard Island coast"
+msgstr "imagico.de: Costa da Ilha Heard"
 
 msgid ""
 "Recent image of Heard island with interior mostly cloud covered but mostly "
 "well visible coast (true color)"
 msgstr ""
+"Imagens recentes da Ilha Heard com o interior coberto de nuvens, mas a costa "
+"é visível (cor verdadeira)"
 
 msgid "basemap.at"
 msgstr "basemap.at"
 
 msgid "Basemap of Austria, based on goverment data."
-msgstr ""
+msgstr "Mapa Base da Áustria, baseado em dados governamentais."
 
 msgid "basemap.at Orthofoto"
 msgstr "basemap.at Orthofoto"
@@ -25586,6 +25679,7 @@ msgstr "basemap.at Orthofoto"
 msgid ""
 "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery."
 msgstr ""
+"Camada Ortofoto provida por basemap.at. \"Sucessora\" das imagens geoimage.at"
 
 msgid "Geoimage.at MaxRes"
 msgstr ""
@@ -25600,13 +25694,13 @@ msgid "Tiris: DOM (Surface model)"
 msgstr "Tiris: DOM (Modelo de superfície)"
 
 msgid "Tiris: contour lines"
-msgstr ""
+msgstr "Tiris: curvas de nível"
 
 msgid "Tiris: orthophoto"
-msgstr ""
+msgstr "Tiris: ortofoto"
 
 msgid "Tiris: orthophoto infrared"
-msgstr ""
+msgstr "Tiris: ortofoto em infravermelho"
 
 msgid "Vienna: Mehrzweckkarte (general purpose)"
 msgstr "Vienna: Mehrzweckkarte (general purpose)"
@@ -25632,8 +25726,8 @@ msgstr "VoGIS: Flächenwidmungsplan"
 msgid "VoGIS: Höhen und Gelände"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
-msgstr ""
+msgid "imagico.de: Rila and Pirin Mountains"
+msgstr "imagico.de: Montanhas Rila e Pirin"
 
 msgid "OpenStreetMap (Belgian Style)"
 msgstr "OpenStreetMap (Estilo Belga)"
@@ -25648,13 +25742,13 @@ msgid "OpenStreetMap (Belgian Style - German)"
 msgstr "OpenStreetMap (Estilo Belga - Alemão)"
 
 msgid "Orthophoto IGN-NGI"
-msgstr ""
+msgstr "Ortofoto IGN-NGI"
 
 msgid "AGIV Flanders most recent aerial imagery"
-msgstr ""
+msgstr "AGIV Flanders imagens aéreas mais recentes"
 
 msgid "AGIV Flanders 2013-2015 aerial imagery 10cm"
-msgstr ""
+msgstr "AGIV Flanders 2013-2015 imagens aéreas 10cm"
 
 msgid "AGIV Flanders GRB"
 msgstr ""
@@ -25719,17 +25813,20 @@ msgstr ""
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Cotonou"
-msgstr ""
+msgid "imagico.de: Cotonou"
+msgstr "imagico.de: Cotonou"
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
+"Cobertura regular e parcialmente coberta por nuvens em fontes comuns (cor "
+"verdadeira)"
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
-msgstr ""
+msgid "imagico.de: Bouvet Island"
+msgstr "imagico.de: Ilha Bouvet"
 
 msgid "For more accurate coastline and glacier mapping (true color)"
 msgstr ""
+"Para um mapeamento mais acurado da costa e de glaciares (cor verdadeira)"
 
 msgid "IBGE Map of urban areas"
 msgstr "IBGE - Mapa das áreas urbanas"
@@ -25766,76 +25863,76 @@ msgid "SIG Santa Catarina OrtoRGB 2012"
 msgstr "SIG Santa Catarina OrtoRGB 2012"
 
 msgid "Arapiraca AL"
-msgstr ""
+msgstr "Arapiraca AL"
 
 msgid "Branquinha AL"
-msgstr ""
+msgstr "Branquinha AL"
 
 msgid "Cajueiro AL"
-msgstr ""
+msgstr "Cajueiro AL"
 
 msgid "Campo Alegre AL"
-msgstr ""
+msgstr "Campo Alegre AL"
 
 msgid "Capela AL"
-msgstr ""
+msgstr "Capela AL"
 
 msgid "Delmiro Gouveia AL"
-msgstr ""
+msgstr "Delmiro Gouveia AL"
 
 msgid "Estrela de Alagoas"
-msgstr ""
+msgstr "Estrela de Alagoas"
 
 msgid "Girau do Ponciano"
-msgstr ""
+msgstr "Girau do Ponciano"
 
 msgid "Major Isidoro AL"
-msgstr ""
+msgstr "Major Isidoro AL"
 
 msgid "Mar Vermelho AL"
-msgstr ""
+msgstr "Mar Vermelho AL"
 
 msgid "Minador do Negrão"
-msgstr ""
+msgstr "Minador do Negrão"
 
 msgid "Olho d’Agua do Casado AL"
-msgstr ""
+msgstr "Olho d’Agua do Casado AL"
 
 msgid "Palestina AL"
-msgstr ""
+msgstr "Palestina AL"
 
 msgid "Palmeira dos Indios AL"
-msgstr ""
+msgstr "Palmeira dos Indios AL"
 
 msgid "Pão de Açucar AL"
-msgstr ""
+msgstr "Pão de Açucar AL"
 
 msgid "Piranhas AL"
-msgstr ""
+msgstr "Piranhas AL"
 
 msgid "Poço das Trincheiras AL"
-msgstr ""
+msgstr "Poço das Trincheiras AL"
 
 msgid "Santana do Ipanema AL"
-msgstr ""
+msgstr "Santana do Ipanema AL"
 
 msgid "São Miguel dos Campos AL"
-msgstr ""
+msgstr "São Miguel dos Campos AL"
 
 msgid "Teotonio Vilela AL"
-msgstr ""
+msgstr "Teotonio Vilela AL"
 
 msgid "União dos Palmares AL"
-msgstr ""
+msgstr "União dos Palmares AL"
 
 msgid "Viçosa AL"
-msgstr ""
+msgstr "Viçosa AL"
 
 msgid "Alagoas coast 2006"
-msgstr ""
+msgstr "Alagoas Regiões Costeiras 2006"
 
 msgid "DER-ES"
-msgstr ""
+msgstr "DER-ES"
 
 msgid "IBGE-BC250 Isolated Rural Location"
 msgstr "IBGE-BC250 Localidades Rurais Isoladas"
@@ -25859,7 +25956,7 @@ msgid "IBGE-BC250 Units of Sustainable Use - APA"
 msgstr "IBGE-BC250 Unidades de Uso Sustentável - APA"
 
 msgid "IBGE-BC250 Villages"
-msgstr ""
+msgstr "IBGE-BC250 Vilas"
 
 msgid "IBGE-BCIM Stations for Electrical Power Generation"
 msgstr "IBGE-BCIM Estações para Geração de Energia Elétrica"
@@ -25895,34 +25992,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 ""
@@ -25930,7 +26026,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)"
@@ -25978,7 +26074,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -25986,7 +26082,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 ""
@@ -26158,8 +26254,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 ""
@@ -26167,9 +26262,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 ""
@@ -26177,10 +26270,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"
@@ -26213,57 +26306,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 ""
@@ -26271,13 +26359,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 ""
@@ -26345,13 +26433,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 ""
@@ -26359,7 +26447,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -26367,7 +26455,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -26375,19 +26463,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 ""
@@ -26492,13 +26580,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 ""
@@ -26506,7 +26594,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)"
@@ -26600,13 +26688,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 ""
 
@@ -26694,6 +26775,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 ""
 
@@ -26702,6 +26797,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 ""
 
@@ -26709,13 +26828,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 ""
@@ -26729,7 +26848,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 ""
@@ -26737,29 +26856,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)"
@@ -26828,7 +26946,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"
@@ -26861,6 +26982,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 ""
 
@@ -26909,33 +27036,31 @@ msgstr "fator de escala"
 msgid "ScanEx SPOT"
 msgstr "fator de escala"
 
-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 ""
@@ -26943,7 +27068,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)"
@@ -26989,25 +27114,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"
@@ -27031,7 +27156,7 @@ msgstr "IDEIB - Ilhas Baleares"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Ilhas Canárias"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -27127,7 +27252,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 ""
@@ -27135,6 +27260,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"
 
@@ -27153,7 +27285,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)"
@@ -27215,7 +27347,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 ""
@@ -27223,13 +27355,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)"
@@ -27316,7 +27448,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 ""
@@ -27324,7 +27463,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"
@@ -27339,6 +27478,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr "7ª Series (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr "OS New Popular Edition historic"
 
@@ -28166,7 +28311,7 @@ msgid "Definition of {0} is unclear"
 msgstr "Definição de {0} está incerta"
 
 msgid "{0} + {1} + {2}"
-msgstr ""
+msgstr "{0} + {1} + {2}"
 
 msgid ""
 "{0} is not recommended. Use the Reverse Ways function from the Tools menu."
@@ -28174,7 +28319,7 @@ msgstr ""
 "{0} não é recomendado. Use a função Reverter Caminhos no menu Ferramentas."
 
 msgid "{0}"
-msgstr ""
+msgstr "{0}"
 
 msgid "key with uncommon character"
 msgstr "chave com caractere incomum"
@@ -28366,49 +28511,36 @@ msgstr "{0} deve ser um valor inteiro entre -5 e 5"
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr "{0} deve ter números apenas com incrementos opcionais de .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}: metros é padrão; ponto é separador; se unidades, colocar espaço então a "
-"unidade"
 
 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}: tonelada é padrão; ponto é separador; se unidade, coloque espaço antes "
-"da unidade"
 
-msgid "unusual {0} format"
-msgstr "formato {0} incomum"
+msgid "unusual value of {0}"
+msgstr "valor não usual de {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ômetro é padrão; ponto é separador; se unidade, coloque espaço "
-"antes da unidade"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr "tensão deve ser em volts sem unidades /delimitador/espaços"
 
-msgid "unusual {0} specification"
-msgstr "especificação {0} incomum"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "bitola ferroviária incomum ; usar mm sem separador"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr "inclinação incomum; usar percentagens/graus ou para acima/abaixo"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} precisa ser um valor numérico"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} deve ser um número inteiro positivo"
 
-msgid "unusual value of {0}"
-msgstr "valor não usual de {0}"
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr "{0} deve ser um valor numérico, em metros e sem unidade"
 
@@ -28481,36 +28613,46 @@ msgstr ""
 "o idioma da wikipedia ''{0}'' é inválido, utilize ''{1}'' ao invés disto"
 
 msgid "{0} tag should not have URL-encoded values like ''%27''"
-msgstr ""
+msgstr "A etiqueta {0} não deve ter valores codificados na URL, como ''%27''"
 
 msgid "wikipedia title should not start with a space after language code"
 msgstr ""
+"o título da página em wikipedia não deve iniciar com um espaço após o código "
+"da linguagem"
 
 msgid "wikipedia title should not have ''{0}'' prefix"
-msgstr ""
+msgstr "o título da página em wikipedia não deve ter o prefixo ''{0}''"
 
 msgid "wikipedia page title should have first letter capitalized"
-msgstr ""
+msgstr "o título da página em wikipedia deve ter a primeira letra maiúscula"
 
 msgid ""
 "wikipedia page title should have spaces instead of underscores (''_''→'' '')"
 msgstr ""
+"o título da página em wikipedia deve ter espaços ao invés de subtraços  "
+"(''_''→'' '')"
 
 msgid "wikipedia language seems to be duplicated, e.g. en:en:Foo"
-msgstr ""
+msgstr "a linguagem em wikipedia aparenta estar duplicada, ex: pt:pt:Foo"
 
 msgid "wikidata tag must be in Qnnnn format, where n is a digit"
 msgstr ""
+"a etiqueta wikidata deve estar com um formato Qxxxx, onde x é um número"
 
 msgid ""
 "wikipedia tag is set, but there is no wikidata tag. Wikipedia plugin might "
 "help with wikidata id lookups"
 msgstr ""
+"a etiqueta wikipedia está definida, mas não existe uma etiqueta wikidata. O "
+"plugin Wikipédia pode ajudar a encontrar um id do Wikidata"
 
 msgid ""
 "wikipedia tag is not set, but a ''{0}'' tag is. Make sure to use "
 "wikipedia=language:value together with wikidata tag."
 msgstr ""
+"a etiqueta wikipedia não está definida, mas a etiqueta ''{0}'' está. "
+"Certifique-se de usar wikipedia=linguagem:valor junto com a etiqueta "
+"wikidata."
 
 msgid "Hide icons at low zoom"
 msgstr "Ocultar ícones ao afastar zoom"
@@ -28518,6 +28660,9 @@ msgstr "Ocultar ícones ao afastar zoom"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Símbolos de nós menos intrusivos em zoom baixo"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Exibir rótulos de rua (com zoom alto)"
 
@@ -28573,6 +28718,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."
@@ -28618,6 +28766,9 @@ msgstr ""
 "Implementa uma linha de comando e permite criar seus comandos. Veja o link "
 "para os comandos padrão (arco, círculo, etc.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -28651,7 +28802,7 @@ msgid "Downloads OSM data along a way"
 msgstr "Baixa dados OSM ao longo de uma via"
 
 msgid "Dxf Import"
-msgstr ""
+msgstr "Importar Dxf"
 
 msgid ""
 "Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
@@ -28674,6 +28825,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Handling of French EPCIs (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Usar script externo no JOSM"
 
@@ -28758,6 +28914,7 @@ msgstr ""
 
 msgid "This plugin simplifies the mapping and editing of indoor corridors."
 msgstr ""
+"Este plugin simplifica o mapeamento e a edição de corredores internos"
 
 msgid ""
 "Gives assistance for the mapping process of indoor OSM building data. "
@@ -28880,6 +29037,9 @@ msgstr ""
 "Permite a abertura gpx/arquivos osm que cruzam a área atualmente visível da "
 "tela"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -29091,7 +29251,7 @@ msgid "Plugin to digital sign OSM-Data"
 msgstr "Plugin para sinal digital do OSM-Data"
 
 msgid "Editor to add turn lanes tags in highways"
-msgstr ""
+msgstr "Editor para adicionar etiquetas de faixas de manobra em vias"
 
 msgid ""
 "Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -29369,7 +29529,7 @@ msgid "Shape is started incorrectly"
 msgstr ""
 
 msgid "Can''t load SVG diagram"
-msgstr ""
+msgstr "Não é possível carregar o diagrama SVG"
 
 msgid "Can''t find root SVG element"
 msgstr ""
@@ -29754,551 +29914,6 @@ msgstr "Importar imagem georreferenciada"
 msgid "Error while creating image layer: "
 msgstr "Erro ao criar camada de imagem: "
 
-msgid "Mapillary Images"
-msgstr "Mapillary Imagens"
-
-msgid "Mapillary layer"
-msgstr "Mapillary camada"
-
-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 "Obtendo imagens do Mapillary na visão atual"
-
-msgid "Export pictures"
-msgstr "Exportar imagens"
-
-msgid "Export Mapillary pictures"
-msgstr "Exportar imagens do Mapillary"
-
-msgid "Export images"
-msgstr "Exportar imagens"
-
-msgid "Import pictures"
-msgstr "Importar imagens"
-
-msgid "Import local pictures"
-msgstr "Importar imagens locais"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Importar imagens na camada do Mapillary"
-
-msgid "Join mode"
-msgstr "Join mode"
-
-msgid "Join/unjoin pictures"
-msgstr "Juntar/Desunir imagens"
-
-msgid "Submit changeset"
-msgstr ""
-
-msgid "Submit the current changeset"
-msgstr ""
-
-msgid "Submit the current changeset to Mapillary"
-msgstr ""
-
-msgid "rejected"
-msgstr ""
-
-msgid "pending"
-msgstr "pendente"
-
-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 "Modo caminhada"
-
-msgid "Zoom to selected image"
-msgstr "Zoom para a imagem selecionada"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Zoom para a imagem selecionada no Mapillary no momento"
-
-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 "Exportar todas as imagens"
-
-msgid "Export selected sequence"
-msgstr "Exportar sequência selecionada"
-
-msgid "Export selected images"
-msgstr "Exportação imagens selecionadas"
-
-msgid "Rewrite imported images"
-msgstr "Reescreve imagens importadas"
-
-msgid "Select a directory"
-msgstr "Selecione um diretório"
-
-msgid "Explore"
-msgstr "Explorar"
-
-msgid "Speed limit"
-msgstr "Limite de velocidade"
-
-msgid "Give way"
-msgstr "Dê a preferência"
-
-msgid "No entry"
-msgstr "Entrada proibida"
-
-msgid "Intersection danger"
-msgstr "Cruzamento perigoso"
-
-msgid "Mandatory direction (any)"
-msgstr "Sentido obrigatório (qualquer)"
-
-msgid "Uneven road"
-msgstr "Estrada irregular"
-
-msgid "No parking"
-msgstr "Proibido estacionar"
-
-msgid "No overtaking"
-msgstr "Proibido ultrapassar"
-
-msgid "Pedestrian crossing"
-msgstr "Travessia de pedestres"
-
-msgid "No turn"
-msgstr "Proibido virar"
-
-msgid "Years"
-msgstr "Anos"
-
-msgid "Months"
-msgstr "Meses"
-
-msgid "Days"
-msgstr "Dias"
-
-msgid "Imported images"
-msgstr "Imagens importadas"
-
-msgid "Mapillary filter"
-msgstr "Mapillary filtro"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Abrir filtro Mapillary"
-
-msgid "Not older than: "
-msgstr "Não mais velho do que: "
-
-msgid "Downloaded images"
-msgstr "Imagens baixadas"
-
-msgid "Only images with signs"
-msgstr "Somente imagens com placas"
-
-msgid "Choose signs"
-msgstr "Escolha placas"
-
-msgid "Mapillary history"
-msgstr "Mapillary história"
-
-msgid "Open Mapillary history dialog"
-msgstr "Abrir histórico Mapillary"
-
-msgid "No image selected"
-msgstr "Nenhuma imagem selecionada"
-
-msgid "Press \"{0}\" to download images"
-msgstr ""
-
-msgid "Mapillary picture"
-msgstr "Mapillary foto"
-
-msgid "Open Mapillary window"
-msgstr "Abrir janela Mapillary"
-
-msgid "Next picture"
-msgstr "Próxima foto"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Mostra a próxima foto na sequência"
-
-msgid "Previous picture"
-msgstr "Foto anterior"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Mostra a foto anterior na sequência"
-
-msgid "Jump to red"
-msgstr "Ir para vermelho"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Pula para a foto no outro lado da linha vermelha"
-
-msgid "Jump to blue"
-msgstr "Ir para azul"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Pula para a foto no outro lado da linha azul"
-
-msgid "Stops the walk."
-msgstr "Para a caminhada."
-
-msgid "Play"
-msgstr "Tocar"
-
-msgid "Continues with the paused walk."
-msgstr "Continua com a caminhada pausada."
-
-msgid "Pause"
-msgstr "Pausar"
-
-msgid "Pauses the walk."
-msgstr "Pausa a caminhada."
-
-msgid "Display hour when the picture was taken"
-msgstr "Mostra hora quando a foto foi tirada"
-
-msgid "Use 24 hour format"
-msgstr "Usar formato de 24 horas"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr "Move para a localização de fotos com os botões próximo/anterior"
-
-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 "Modo de download"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr "Você está logado como ''{0}''."
-
-msgid "You are currently not logged in."
-msgstr "No momento você não está logado."
-
-msgid "Login"
-msgstr "Login"
-
-msgid "Logout"
-msgstr "Logout"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr ""
-"Vá para configuração e faça login no Mapillary antes de fazer o upload."
-
-msgid "Upload selected sequence"
-msgstr "Enviar sequência selecionada"
-
-msgid "Delete after upload"
-msgstr "Excluir após o upload"
-
-msgid "Wait for full quality pictures"
-msgstr "Espere por imagens de qualidade total"
-
-msgid "Follow selected image"
-msgstr "Seguir imagem selecionada"
-
-msgid "Go forward"
-msgstr "Ir para a frente"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr ""
-
-msgid "Import"
-msgstr "Importar"
-
-msgid "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] "Apagar {0} imagem"
-msgstr[1] "Apagar {0} imagens"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "Importar {0} imagem"
-msgstr[1] "Importar {0} imagens"
-
-msgid "2 images joined"
-msgstr "2 imagens se juntaram"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "Movida {0} imagem"
-msgstr[1] "Movidas {0} imagens"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "Virada {0} imagem"
-msgstr[1] "Viradas {0} imagens"
-
-msgid "2 images unjoined"
-msgstr "2 imagens se separaram"
-
-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 "Baixando"
-
-msgid "Select mode"
-msgstr "Modo de seleção"
-
-msgid "Mapillary login"
-msgstr "Mapillary login"
-
-msgid "Login successful, return to JOSM."
-msgstr "Login bem sucedido, retornar ao JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Formatos de imagens suportado (JPG e PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "Baixar imagens do Mapillary"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Total de imagens Mapillary: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr ""
-
-msgid "No images found"
-msgstr "Nenhuma imagem encontrada"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr ""
-
-msgid "Finished upload"
-msgstr "Upload terminado"
-
-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 "Enviando: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -31115,6 +30730,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 ""
+"Essa ferramenta só pode substituir um nó, atualizar um nó a uma via ou a um "
+"multipolígono, ou substituir uma via com uma via."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "Não pertence a(s) via(s), não pode ser substituído."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+"Relação não é um multipolígono, não pode ser utilizado como um substituto."
+
+msgid "Replace geometry for node {0}"
+msgstr "Substitui a geometria para o nó {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Por favor, selecione uma forma que exista no banco de dados e uma nova via "
+"com a geometria correta."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "Os caminhos devem estar dentro da área de baixada."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"O caminho a ser substituído não pode ter nós com propriedades ou membros de "
+"relações a menos que sejam comuns a ambos caminhos."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"Excedido limite de iteração para metodologia rigorosa, usando método mais "
+"simples."
+
+msgid "Replace geometry for way {0}"
+msgstr "Substitui a geometria para a via {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Muitas vias foram adicionadas: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -31148,9 +30870,30 @@ msgstr "Tags para edifícios:"
 msgid "Cannot place building outside of the world."
 msgstr "Não é possível colocar a construção fora do mundo."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Criar um prédio"
 
+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 "Informe o tamanho do prédio"
 
@@ -31163,8 +30906,17 @@ msgstr "Seleção automática de construção"
 msgid "Use address nodes under buildings"
 msgstr "Use endereço dos nós abaixo dos prédios"
 
-msgid "Buildings width:"
-msgstr "Largura do edifício:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Comprimento do passo:"
@@ -31912,6 +31664,18 @@ msgstr "Excluir o esquema selecionado da lista."
 msgid "Color Schemes"
 msgstr "Esquemas de cores"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Abortar a edição de etiqueta e fechar diálogo"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Aplicar etiquetas editadas e fechar diálogo"
+
 msgid "Conflation"
 msgstr "Fusão"
 
@@ -32425,6 +32189,9 @@ msgstr "Abrir painel GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Zoom para ver mensagens"
 
+msgid "Login"
+msgstr "Login"
+
 msgid "Enable autologin"
 msgstr "Ativar login automático"
 
@@ -32457,24 +32224,15 @@ msgstr "Chat privado"
 msgid "Close tab"
 msgstr "Fechar aba"
 
+msgid "Logout"
+msgstr "Logout"
+
 msgid "Clear log"
 msgstr "Limpar log"
 
 msgid "Show users on map"
 msgstr "Mostrar usuários no mapa"
 
-msgid "GeoJSON file"
-msgstr "Arquivo GeoJSON"
-
-msgid "Loading json file..."
-msgstr "Carregando arquivo JSON..."
-
-msgid "Data Layer from GeoJSON: "
-msgstr ""
-
-msgid "Error loading geojson file {0}"
-msgstr ""
-
 msgid "Position only"
 msgstr "Somente posição"
 
@@ -32565,6 +32323,9 @@ msgstr "Importação Globalsat"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importa dados do Globalsat Datalogger DG100 na camada GPX."
 
+msgid "Import"
+msgstr "Importar"
+
 msgid "GPS Blams"
 msgstr "GPS Blams"
 
@@ -33312,7 +33073,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"
@@ -33345,31 +33124,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"
@@ -34542,6 +34382,27 @@ msgstr "Extensão de arquivo desconhecida: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Análise do arquivo \"{0}\" falhou"
 
+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"
 
@@ -34880,6 +34741,9 @@ msgstr "Editar dados GPS foto"
 msgid "Please select an image first."
 msgstr "Por favor, selecione uma imagem em primeiro lugar."
 
+msgid "No image selected"
+msgstr "Nenhuma imagem selecionada"
+
 msgid "(Empty values delete the according fields.)"
 msgstr "(Valores vazios excluem os campos de acordo)."
 
@@ -35631,6 +35495,9 @@ msgstr "implícito"
 msgid "State"
 msgstr "Estado"
 
+msgid "pending"
+msgstr "pendente"
+
 msgid "[incomplete]"
 msgstr "[incompleto]"
 
@@ -36053,12 +35920,6 @@ msgstr "Novo valor para {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr "Preferência ''{0}'' ausente. Não é possível inicializar SdsApi."
 
-msgid "Failed to open connection to API {0}."
-msgstr "Falhou ao abrir conexão para API {0}."
-
-msgid "Proxy Authentication Required"
-msgstr "Autenticação de Proxy Necessária"
-
 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>"
@@ -36424,12 +36285,6 @@ msgstr "Plug-in do Editor de Etiquetas do JOSM"
 msgid "Presets"
 msgstr "Predefinições"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Abortar a edição de etiqueta e fechar diálogo"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Aplicar etiquetas editadas e fechar diálogo"
-
 msgid "Highlight"
 msgstr "Realçar"
 
@@ -37835,17 +37690,17 @@ msgstr "Altera para o editor básico e seleciona uma via"
 msgid "Unable to undelete node {0}. Object has likely been redacted"
 msgstr ""
 "Não é possível desfazer a exclusão do nó {0}. Objeto foi provavelmente "
-"editado"
+"redigido (redacted)"
 
 msgid "Unable to undelete way {0}. Object has likely been redacted"
 msgstr ""
 "Não é possível desfazer a exclusão da via {0}. Objeto foi provavelmente "
-"editado"
+"redigido (redacted)"
 
 msgid "Unable to undelete relation {0}. Object has likely been redacted"
 msgstr ""
 "Não é possível desfazer a exclusão da relação {0}. Objeto foi provavelmente "
-"editado"
+"redigido (redacted)"
 
 msgid "Undelete object..."
 msgstr "Retornar objetos apagados..."
@@ -38157,48 +38012,6 @@ msgstr ""
 "Esta ferramenta substitui a geometria de um objeto com outro, e assim requer "
 "exatamente dois objetos a serem selecionados."
 
-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 ""
-"Essa ferramenta só pode substituir um nó, atualizar um nó a uma via ou a um "
-"multipolígono, ou substituir uma via com uma via."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "Não pertence a(s) via(s), não pode ser substituído."
-
-msgid "Replace geometry for node {0}"
-msgstr "Substitui a geometria para o nó {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-"Relação não é um multipolígono, não pode ser utilizado como um substituto."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Por favor, selecione uma forma que exista no banco de dados e uma nova via "
-"com a geometria correta."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "Os caminhos devem estar dentro da área de baixada."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"O caminho a ser substituído não pode ter nós com propriedades ou membros de "
-"relações a menos que sejam comuns a ambos caminhos."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"Excedido limite de iteração para metodologia rigorosa, usando método mais "
-"simples."
-
-msgid "Replace geometry for way {0}"
-msgstr "Substitui a geometria para a via {0}"
-
 msgid "Replace Membership"
 msgstr "Substituir Membro Associado"
 
@@ -38276,9 +38089,6 @@ msgstr "Selecionar nós do meio"
 msgid "Please select two nodes connected by way!"
 msgstr "Por favor, selecione dois nós conectados por uma via!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Muitas vias foram adicionadas: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Tudo dentro [teste]"
 
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index ea27a0b..1d7b419 100644
--- a/i18n/po/rm.po
+++ b/i18n/po/rm.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2009-06-21 19:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Raeto-Romance <rm at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n !=1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:58+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:59+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: \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/ro.po b/i18n/po/ro.po
index 2d10a5b..429dd50 100644
--- a/i18n/po/ro.po
+++ b/i18n/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2015-02-24 11:34+0000\n"
 "Last-Translator: Ciprian <c1pr1an_43v3r at yahoo.com>\n"
 "Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:59+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 04:59+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "X-Poedit-Country: ROMANIA\n"
 "Language: ro\n"
 "X-Poedit-Language: Romanian\n"
@@ -995,8 +995,8 @@ msgstr ""
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
-msgstr "Separă Strat"
+msgid "Download as new layer"
+msgstr ""
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr ""
@@ -2295,12 +2295,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"
@@ -8302,9 +8302,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>"
@@ -9757,6 +9754,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12805,9 +12805,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 ""
 
@@ -14501,6 +14498,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 ""
 
@@ -14510,10 +14511,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 ""
@@ -16337,10 +16334,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17826,6 +17819,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17847,6 +17843,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20500,6 +20499,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23571,6 +23576,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 ""
 
@@ -23652,7 +23684,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23667,7 +23699,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 ""
@@ -23675,21 +23707,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 ""
 
@@ -23828,13 +23882,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"
@@ -23867,14 +23921,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 ""
@@ -23940,7 +23994,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)"
@@ -24027,13 +24081,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)"
@@ -24201,34 +24255,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 ""
@@ -24236,7 +24289,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)"
@@ -24284,7 +24337,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24292,7 +24345,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 ""
@@ -24461,8 +24514,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 ""
@@ -24470,9 +24522,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 ""
@@ -24480,10 +24530,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"
@@ -24516,57 +24566,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 ""
@@ -24574,13 +24619,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 ""
@@ -24648,13 +24693,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 ""
@@ -24662,7 +24707,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24670,7 +24715,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24678,19 +24723,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 ""
@@ -24795,13 +24840,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 ""
@@ -24809,7 +24854,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)"
@@ -24903,13 +24948,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 ""
 
@@ -24997,6 +25035,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 ""
 
@@ -25005,6 +25057,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 ""
 
@@ -25012,13 +25088,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 ""
@@ -25032,7 +25108,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 ""
@@ -25040,29 +25116,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)"
@@ -25131,7 +25206,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"
@@ -25164,6 +25242,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 ""
 
@@ -25212,33 +25296,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 ""
@@ -25246,7 +25328,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)"
@@ -25292,25 +25374,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"
@@ -25334,7 +25416,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)"
@@ -25430,7 +25512,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 ""
@@ -25438,6 +25520,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 ""
 
@@ -25456,7 +25545,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)"
@@ -25518,7 +25607,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 ""
@@ -25526,13 +25615,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)"
@@ -25619,7 +25708,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 ""
@@ -25627,7 +25723,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"
@@ -25642,6 +25738,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26633,32 +26735,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"
@@ -26667,9 +26765,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 ""
 
@@ -26776,6 +26871,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 ""
 
@@ -26819,6 +26917,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."
@@ -26852,6 +26953,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26899,6 +27003,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 ""
 
@@ -27064,6 +27173,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 ""
@@ -27853,550 +27965,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 ""
 
@@ -29091,6 +28659,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 ""
 
@@ -29124,9 +28790,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 ""
 
@@ -29139,7 +28826,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:"
@@ -29818,6 +29514,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 ""
 
@@ -30312,6 +30020,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30344,22 +30055,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"
@@ -30449,6 +30151,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31138,7 +30843,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"
@@ -31171,31 +30894,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"
@@ -32276,6 +32060,27 @@ msgstr "Extensie fişier necunoscută : {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 ""
 
@@ -32609,6 +32414,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33346,6 +33154,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33756,12 +33567,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>"
@@ -34098,12 +33903,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35644,39 +35443,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 ""
 
@@ -35750,9 +35516,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/ru.po b/i18n/po/ru.po
index 1765172..c5f0aa2 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-29 05:53+0000\n"
-"Last-Translator: Nkolay Parukhin <parukhin at gmail.com>\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-27 10:28+0000\n"
+"Last-Translator: Aleksey Kabanov <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-12-31 04:59+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:00+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: ru_RU\n"
 
 msgid "Use OAuth"
@@ -1059,8 +1059,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 "Отметьте, если данные должны быть скачаны в новый слой"
@@ -2501,17 +2501,17 @@ msgstr "Преобразовать в слой GPX, начиная с после
 
 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 ""
-"Рекурсивно преобразовать это отношение в один gpx-трек, начиная с первого "
-"участника(ов) и заканчивая последним."
+"Рекурсивно преобразовать это отношение в gpx-трек, начиная с первого "
+"участника, и заканчивая последним."
 
 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 ""
-"Рекурсивно преобразовать это отношение в один gpx-трек, начиная с последнего "
-"участника(ов) и заканчивая первым."
+"Рекурсивно преобразовать это отношение в gpx-трек, начиная с последнего "
+"участника, и заканчивая первым."
 
 msgid "Selected Relations"
 msgstr "Выбранные отношения"
@@ -9042,9 +9042,6 @@ msgstr "Значение широты должно быть в пределах
 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>"
@@ -10758,6 +10755,9 @@ msgstr "Нет данных в файле ''{0}''."
 msgid "Open OSM file"
 msgstr "Открыть файл OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr "Файлы сервера OSM, сжатые с помощью XZ"
+
 msgid "Validation Error Files"
 msgstr "Файлы ошибок при проверке"
 
@@ -14141,9 +14141,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 "Подтверждать все действия Удалённого управления вручную"
 
@@ -16061,6 +16058,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}''."
 
@@ -16072,12 +16075,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 ""
@@ -18107,10 +18104,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "на крыше"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "будка"
-
 msgid "Start date"
 msgstr "Дата запуска"
 
@@ -19622,6 +19615,9 @@ msgstr "биодизель"
 msgid "Octane 80"
 msgstr "бензин АИ-80"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "бензин АИ-91"
 
@@ -19643,6 +19639,9 @@ msgstr "E10 (10% смесь этанола)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% смесь этанола)"
 
+msgid "Ethanol (alcohol)"
+msgstr "Этанол (спирт)"
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "пропан-бутан (АГЗС)"
 
@@ -22098,7 +22097,7 @@ msgstr "аварийный выход"
 
 msgctxt "entrance"
 msgid "staircase"
-msgstr "в подъезд/на лестницу"
+msgstr "к лестнице"
 
 msgctxt "entrance"
 msgid "home"
@@ -22300,6 +22299,12 @@ msgstr "Фонтан"
 msgid "Water Well"
 msgstr "Колодец"
 
+msgid "Pump"
+msgstr "Насос"
+
+msgid "powered"
+msgstr "автоматический"
+
 msgid "Lighthouse"
 msgstr "Маяк"
 
@@ -22834,7 +22839,7 @@ msgstr "распределительная"
 
 msgctxt "power"
 msgid "minor_distribution"
-msgstr "комплектная"
+msgstr "потребительская"
 
 msgctxt "power"
 msgid "converter"
@@ -25403,6 +25408,39 @@ msgstr "OpenSnowMap"
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr "Оверлей для картирования лыжных трасс  в OSM. Ежедневное обновление."
 
+msgid "OpenRailwayMap"
+msgstr "OpenRailwayMap"
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr "Оверлей для картографирования железных дорог в OSM"
+
+msgid "OpenInfraMap Telecoms"
+msgstr "OpenInfraMap: телекоммуникации"
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Оверлей для картографирования телекоммуникационной инфраструктуры в OSM. "
+"Обновляется ежедневно."
+
+msgid "OpenInfraMap Power"
+msgstr "OpenInfraMap: электроэнергетика"
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Оверлей для картографирования электроэнергетической инфраструктуры в OSM. "
+"Обновляется ежедневно."
+
+msgid "OpenInfraMap Petroleum"
+msgstr "OpenInfraMap: нефтегазовая инфраструктура"
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Оверлей для картографирования нефтегазовой инфраструктуры в OSM. Обновляется "
+"ежедневно."
+
 msgid "skobbler"
 msgstr "skobbler"
 
@@ -25484,8 +25522,8 @@ msgstr "OSM Inspector: адреса"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM Inspector: береговая линия (ЕС)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr "Снимки с imagico.de: горный массив Проклетие"
+msgid "imagico.de: Prokletije Mountains"
+msgstr ""
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
@@ -25501,8 +25539,8 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr "Дороги и здания Тираны, размещённые на геопортале Open Labs"
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
-msgstr "Снимки с imagico.de: «Южные» Трансантарктические горы"
+msgid "imagico.de: Southern Transantarctic Mountains"
+msgstr ""
 
 msgid ""
 "Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
@@ -25511,24 +25549,45 @@ msgstr ""
 "За пределами обычного покрытия Landsat, поэтому отсутствует в LIMA и "
 "Bing/Mapbox (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
-msgstr "Снимки с imagico.de: горы Пенсакола"
+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 ""
-"Снимки с imagico.de: остров Мордвинова (Элефант)/остров Шишкова (Кларенс)"
 
 msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
 msgstr ""
 "Достаточно чистые актуальные снимки для обновления границ ледника "
 "(естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
-msgstr "Снимки с imagico.de: Земля Эндерби и Берег Кемпа"
+msgid "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 "Sentinel-2 - снимки Земли Эндерби и Берега Кемпа (true color)"
 
+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 - топографическая карта (TMS)"
 
@@ -25667,14 +25726,14 @@ msgstr "Министерство агропромышленности (WMS)"
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr "Министерство энергетики и горнодобывающей промышленности (WMS)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
-msgstr "Снимки с imagico.de: Баия-Бланка (во время отлива)"
+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)"
-msgstr "Снимки с imagico.de: Баия-Бланка (во время прилива)"
+msgid "imagico.de: Bahía Blanca (high tide)"
+msgstr ""
 
 msgid "AGRI black-and-white 2.5m"
 msgstr "AGRI черно-белая 2.5м"
@@ -25706,16 +25765,16 @@ msgstr "LPI NSW административные границы государс
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW административные границы охраняемых природных зон NPWS"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
-msgstr "Снимки с imagico.de: северо-запад острова Херд"
+msgid "imagico.de: Northwest Heard Island"
+msgstr ""
 
 msgid ""
 "Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
 msgstr ""
 "Ледники северо-запада острова Херд (уже обрисованные в OSM) (ИК псевдоцвета)"
 
-msgid "imagico.de OSM images for mapping: Heard Island coast"
-msgstr "Снимки с imagico.de: побережье острова Херд"
+msgid "imagico.de: Heard Island coast"
+msgstr ""
 
 msgid ""
 "Recent image of Heard island with interior mostly cloud covered but mostly "
@@ -25783,8 +25842,8 @@ msgstr "VoGIS: план зонирования"
 msgid "VoGIS: Höhen und Gelände"
 msgstr "VoGIS: высоты и рельеф местности"
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
-msgstr "Снимки с imagico.de: горные массивы Рила и Пирин"
+msgid "imagico.de: Rila and Pirin Mountains"
+msgstr ""
 
 msgid "OpenStreetMap (Belgian Style)"
 msgstr "OpenStreetMap (бельгийский стиль)"
@@ -25870,16 +25929,16 @@ msgstr "Автобусные остановки TEC"
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "Бенин: Котону 2016 (Pleiade)"
 
-msgid "imagico.de OSM images for mapping: Cotonou"
-msgstr "Снимки с imagico.de: Котону"
+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"
-msgstr "Снимки с imagico.de: остров Буве"
+msgid "imagico.de: Bouvet Island"
+msgstr ""
 
 msgid "For more accurate coastline and glacier mapping (true color)"
 msgstr ""
@@ -26051,14 +26110,14 @@ msgstr "Высококачественные аэрофотоснимки гор
 msgid "Kelowna Roads overlay"
 msgstr "Келоуна - оверлей дорог"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
-msgstr "Снимки с imagico.de: восточное побережье острова Девон"
+msgid "imagico.de: Eastern Devon Island coast"
+msgstr ""
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr "Побережье, в основном уже обрисованное в OSM (ИК псевдоцвета)"
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
-msgstr "Снимки с imagico.de: север острова Элсмир"
+msgid "imagico.de: Northern Ellesmere Island"
+msgstr ""
 
 msgid ""
 "Assembled from July 2012 ASTER imagery (true color with estimated blue)"
@@ -26066,9 +26125,8 @@ msgstr ""
 "Собрано из снимков ASTER от июля 2012 (естественные цвета с восстановленным "
 "синим каналом)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
-msgstr "Снимки с imagico.de: остров Элсмир, июль 2016"
+msgid "imagico.de: Northern Ellesmere Island July 2016"
+msgstr ""
 
 msgid ""
 "Assembled from July 2016 ASTER imagery (true color with estimated blue)"
@@ -26076,14 +26134,14 @@ msgstr ""
 "Собрано из снимков ASTER от июля 2016 (естественные цвета с восстановленным "
 "синим каналом)"
 
-msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
-msgstr "Снимки с imagico.de: остров Фогу, Кабо-Верде"
+msgid "imagico.de: Fogo, Cape Verde"
+msgstr ""
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr "Снимки после извержения 2014/2015 годов (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
-msgstr "Снимки с imagico.de: остров Лондондерри"
+msgid "imagico.de: Isla Londonderry"
+msgstr ""
 
 msgid ""
 "A lot of very coarse coastlines could be improved here, much snow cover "
@@ -26092,8 +26150,8 @@ msgstr ""
 "Позволяет улучшить ряд очень грубых линий побережья, из-за плотного снежного "
 "покрова не подходит для обрисовки ледников (ИК в псевдоцветах)"
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
-msgstr "Снимки с imagico.de: вулкан Кальбуко"
+msgid "imagico.de: Volcán Calbuco"
+msgstr ""
 
 msgid "Image from after the 2015 eruption (true color)"
 msgstr "Снимки после извержения 2015 года (естественные цвета)"
@@ -26140,8 +26198,8 @@ msgstr "Стевнс"
 msgid "Vejmidte"
 msgstr "Vejmidte"
 
-msgid "imagico.de OSM images for mapping: El Altar"
-msgstr "Снимки с imagico.de: вулкан Алтар"
+msgid "imagico.de: El Altar"
+msgstr ""
 
 msgid ""
 "2007 ASTER image offering better glacier coverage than common sources (true "
@@ -26150,9 +26208,8 @@ msgstr ""
 "Снимки ASTER 2007 обеспечивают лучший охват ледников, чем обычные источники "
 "(естественные цвета с восстановленным синим каналом)"
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
-"Снимки с imagico.de: острова Дарвин (Кулпеппер) и Вулф (Уэнмен), Галапагос"
 
 msgid ""
 "Recent image, only old and poor images in other sources currently (true "
@@ -26322,9 +26379,8 @@ 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: прибрежные отмели Северной Германии"
+msgid "imagico.de: Northern German west coast tidalflats"
+msgstr ""
 
 msgid ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
@@ -26333,12 +26389,8 @@ 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: прибрежные отмели Северной Германии (инфракрасные "
-"снимки)"
 
 msgid ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
@@ -26347,11 +26399,11 @@ msgstr ""
 "Свежие снимки берега во время отлива для обновления карт ваттов и баров (ИК "
 "в псевдоцветах)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr "Снимки с imagico.de: побережье Северного моря, 2016"
+msgid "imagico.de: North Sea Coast 2016"
+msgstr ""
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
-msgstr "Снимки с imagico.de: берег Северного моря 2017"
+msgid "imagico.de: North Sea Coast 2017"
+msgstr ""
 
 msgid "Saxony latest aerial imagery"
 msgstr "Саксония: самые новые аэрофотоснимки"
@@ -26383,63 +26435,56 @@ msgstr "Майнц: самые новые аэрофотоснимки"
 msgid "Munich latest aerial imagery 60cm"
 msgstr "Мюнхен: новые аэрофотоснимки 60см"
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
-msgstr "Снимки с imagico.de: Касигианнгуит"
+msgid "imagico.de: Qasigiannguit"
+msgstr ""
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr "Icebridge DMS - снимки поселения (смещение может быть неверным)"
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
-msgstr "Снимки с imagico.de: авиабаза Туле"
+msgid "imagico.de: Thule Air Base"
+msgstr ""
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr "Снимки Icebridge DMS (смещение может быть неверным)"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
-msgstr "Снимки с imagico.de: Кангерлуссуак осенью"
+msgid "imagico.de: Kangerlussuaq Autumn"
+msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr ""
 "Icebridge DMS: снимки аэропорта и поселения - смещение может быть неточным"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
-msgstr "Снимки с imagico.de: Кангерлуссуак весной"
+msgid "imagico.de: Kangerlussuaq Spring"
+msgstr ""
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 "Icebridge DMS: снимки аэропорта и дорог - смещение может быть неточным"
 
-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"
 
 msgid ""
 "Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
 msgstr ""
 "Аэроснимки Icebridge DMS с авиабазы Туле (смещение может быть неверным)"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
-"2015"
-msgstr "Снимки с imagico.de: авиабаза Туле - DMS, облёт в сентябре 2015"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
+msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
-msgstr "Снимки с imagico.de: авиабаза Туле - DMS, облёт в октябре 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
+msgstr ""
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
-msgstr "Снимки с imagico.de: мозаика Гренландии"
+msgid "imagico.de: Greenland mosaic"
+msgstr ""
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr "Landsat - мозаика Гренландии (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
-msgstr "Снимки с imagico.de:  Landsat не в надире (май 2013)"
+msgid "imagico.de: May 2013 off-nadir Landsat"
+msgstr ""
 
 msgid ""
 "First available image north of the regular Landsat limit, mostly with "
@@ -26448,14 +26493,14 @@ msgstr ""
 "Первое доступное изображение севернее обычного покрытия Landsat, в основном "
 "со сезонным снежным покровом, затрудняющим интерпретацию (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
-msgstr "Снимки с imagico.de: Landsat не в надире (июль 2016)"
+msgid "imagico.de: Landsat off-nadir July 2016"
+msgstr ""
 
 msgid "Latest images north of the regular Landsat limit (true color)"
 msgstr "Новые снимки севернее обычного покрытия Landsat (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
-msgstr "Снимки с imagico.de: север Гренландии (ASTER)"
+msgid "imagico.de: Northern Greenland ASTER"
+msgstr ""
 
 msgid ""
 "Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
@@ -26525,14 +26570,14 @@ msgstr "OpenStreetMap Венгрия (маршруты пешего туризм
 msgid "Hillshade Hungary"
 msgstr "Венгрия: отмывка рельефа"
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
-msgstr "Снимки с imagico.de: восток Исландии"
+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"
-msgstr "Снимки с imagico.de: Качский Ранн"
+msgid "imagico.de: Rann of Kutch"
+msgstr ""
 
 msgid ""
 "Land/water distinction difficult to properly map based on Bing/Mapbox images "
@@ -26541,8 +26586,8 @@ msgstr ""
 "Различия суши/воды которые трудно правильно картографировать на основе "
 "снимков Bing/Mapbox (ИК псевдоцвета)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
-msgstr "Снимки с imagico.de: горы Судирман 2015"
+msgid "imagico.de: Sudirman Range 2015"
+msgstr ""
 
 msgid ""
 "Older image of the Sudirman Range with no fresh snow showing glacier extent "
@@ -26551,8 +26596,8 @@ msgstr ""
 "Более старые снимки горного хребта Судирман без свежего снега, на которых "
 "видны границы ледника (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
-msgstr "Снимки с imagico.de: юго-восток Сулавеси"
+msgid "imagico.de: Southeastern Sulawesi"
+msgstr ""
 
 msgid ""
 "Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
@@ -26561,20 +26606,20 @@ msgstr ""
 "Отсутствующие острова и грубая береговая линия из-за облачности в Bing, "
 "озера также можно дополнительно детализировать (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
-msgstr "Снимки с imagico.de: водохранилище Бакун"
+msgid "imagico.de: Bakun Reservoir"
+msgstr ""
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr "Отсутствующее в старых снимках до 2011 г. (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Batam"
-msgstr "Снимки с imagico.de: Батам"
+msgid "imagico.de: Batam"
+msgstr ""
 
 msgid "Missing Islands in OSM (true color)"
 msgstr "Отсутствующие  в OSM острова (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
-msgstr "Снимки с imagico.de: горы Судирман 2016"
+msgid "imagico.de: Sudirman Range 2016"
+msgstr ""
 
 msgid ""
 "Cloud free image of the Sudirman Range but with fresh snow (true color)"
@@ -26681,15 +26726,15 @@ msgstr "Япония: ортоснимки GSI"
 msgid "Japan GSI Standard Map"
 msgstr "Япония: стандартная карта GSI"
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
-msgstr "Снимки с imagico.de: Аральское море (низкий уровень воды)"
+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)"
-msgstr "Снимки с imagico.de: Аральское море (высокий уровень воды)"
+msgid "imagico.de: Aral Sea (high water level)"
+msgstr ""
 
 msgid ""
 "Water and wetland extents, dams etc. - some remaining winter ice in the "
@@ -26698,8 +26743,8 @@ msgstr ""
 "Границы воды и заболоченных земель, дамбы и т.п. - на севере местами "
 "оставшийся с зимы лёд (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
-msgstr "Снимки с imagico.de: гора Кения, 2016"
+msgid "imagico.de: Mount Kenya 2016"
+msgstr ""
 
 msgid "Up-to-date image for glacier mapping (true color)"
 msgstr "Новые снимки для картографирования ледников (естественные цвета)"
@@ -26806,15 +26851,6 @@ msgstr ""
 "Официальные норвежские географические названия из базы данных SSR. Доступен "
 "выбор категории."
 
-msgid "MTBmap.no"
-msgstr "MTBmap.no"
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-"Норвежская карта маршрутов горных велосипедов из OSM (макс. масштаб 14-16, "
-"зависит от региона)"
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr "Kartverket DTM (цифровая модель рельефа)"
 
@@ -26925,6 +26961,20 @@ msgid ""
 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 "Miljødirektoratet - оверлей природоохранных зон"
 
@@ -26935,6 +26985,34 @@ msgstr ""
 "Норвежские национальные парки, заповедники и другие природоохранные зоны и "
 "объекты из Naturbase, включая Шпицберген"
 
+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 ""
+"Поселения с населением не менее 200 человек и расстоянием между "
+"домовладениями не более 200 метров"
+
+msgid "MTBmap.no"
+msgstr "MTBmap.no"
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+"Норвежская карта маршрутов горных велосипедов из OSM (макс. масштаб 14-16, "
+"зависит от региона)"
+
 msgid "NP Svalbard Orthophoto"
 msgstr "NP - ортоснимки Шпицбергена"
 
@@ -26942,14 +27020,14 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr "Ортоснимки Шпицбергена от Норвежского Полярного Института"
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
-msgstr "Снимки с imagico.de: мозаика Шпицбергена"
+msgid "imagico.de: Svalbard mosaic"
+msgstr ""
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr "Sentinel-2 - мозаика Шпицбергена (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
-msgstr "Снимки с imagico.de: западная часть Каракорума"
+msgid "imagico.de: Western Karakoram"
+msgstr ""
 
 msgid ""
 "Represents approximately minimum snow cover so can be well used for glacier "
@@ -26964,8 +27042,8 @@ msgstr "Сектор Газа - со спутников Pléiades - 06.07.2014"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Сектор Газа - со спутников Pléiades - 06.07.2014 (NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
-msgstr "Снимки с imagico.de: Панамский канал - тихоокеанская сторона"
+msgid "imagico.de: Panama Canal - Pacific side"
+msgstr ""
 
 msgid ""
 "New locks with less clouds than in the Sentinel-2 image - make sure to check "
@@ -26974,36 +27052,33 @@ msgstr ""
 "Новые шлюзы с меньшим количеством облаков, чем на снимках Sentinel-2 - "
 "проверьте привязку снимков (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
-msgstr "Снимки с imagico.de: Панамский канал"
+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"
-msgstr "Снимки с imagico.de: Ванатинаи"
+msgid "imagico.de: Vanatinai"
+msgstr ""
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 "Грубая линия побережья из-за облачного покрова в Bing/Mapbox (естественные "
 "цвета)"
 
-msgid "imagico.de OSM images for mapping: New Ireland"
-msgstr "Снимки с imagico.de: Новая Ирландия"
+msgid "imagico.de: New Ireland"
+msgstr ""
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr ""
 "Много отсутствовавших в OSM островов (сейчас в основном обрисованы) "
 "(естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Coropuna"
-msgstr "Снимки с imagico.de: вулкан Коропуна"
+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 ""
-"Снимки с imagico.de: хребет Кордильера-де-Вильканота и ледниковая шапка "
-"Келькайя"
 
 msgid "Poor and outdated imagery in other sources (true color)"
 msgstr "Плохие и устаревшие снимки в других источниках (естественные цвета)"
@@ -27071,8 +27146,11 @@ msgstr "Катовице: здания"
 msgid "Łódź: Buildings"
 msgstr "Лодзь: здания"
 
-msgid "Łódź: Orthophotomap (aerial image)"
-msgstr "Лодзь: ортофотокарта (спутниковые снимки)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr "Лодзь: ортофотокарта 2015 (спутниковые снимки)"
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
+msgstr "Лодзь: ортофотокарта 2017 (спутниковые снимки"
 
 msgid "Powiat dębicki: Buildings"
 msgstr "Дембицкий повят: здания"
@@ -27104,6 +27182,12 @@ msgstr "Сталёвовольский повят: здания"
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr "Познань: ортофотокарта 2014 (спутниковые снимки)"
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr "Познань: ортофотокарта 2016 (спутниковые снимки)"
+
+msgid "Poznań: Buildings"
+msgstr "Познань: здания"
+
 msgid "Przemyśl: Buildings"
 msgstr "Пшемысль: здания"
 
@@ -27152,36 +27236,34 @@ msgstr "ScanEx IRS"
 msgid "ScanEx SPOT"
 msgstr "ScanEx SPOT"
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
-msgstr "Снимки с imagico.de: Керченский пролив"
+msgid "imagico.de: Kerch Strait"
+msgstr ""
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr "Состояние постройки моста в августе 2016 (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr "Снимки с imagico.de: побережье Печорского моря"
+msgid "imagico.de: Pechora Sea Coast"
+msgstr ""
 
 msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
 msgstr ""
 "Снимки Sentinel-2 берега Печорского моря осенью 2016 (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
-msgstr "Снимки с imagico.de: остров Ушакова, август 2016"
+msgid "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"
-msgstr "Снимки с imagico.de: дельта Северной Двины при отливе"
+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"
-msgstr "Снимки с imagico.de: Северный и Полярный Урал, август 2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
+msgstr ""
 
 msgid ""
 "Up-to-date late summer imagery with few clouds - caution: not all visible "
@@ -27190,8 +27272,8 @@ msgstr ""
 "Новые летние снимки с малой облачностью - внимание: не весь видимый снег "
 "является ледниками  (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
-msgstr "Снимки с imagico.de: космодром «Восточный»"
+msgid "imagico.de: Vostochny Cosmodrome"
+msgstr ""
 
 msgid "Recent image showing newest features (true color)"
 msgstr "Недавние снимки с самыми новыми объектами (естественные цвета)"
@@ -27240,28 +27322,28 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "Южная Африка CD:NGI аэрофотосъёмка"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
-msgstr "Снимки с imagico.de: остров Лескова (ASTER)"
+msgid "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"
-msgstr "Снимки с imagico.de: остров Скотта"
+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"
-msgstr "Снимки с imagico.de: остров Лескова (Landsat)"
+msgid "imagico.de: Leskov Island Landsat"
+msgstr ""
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
-msgstr "Снимки с imagico.de: Скалы Клерк"
+msgid "imagico.de: Clerke Rocks"
+msgstr ""
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
-msgstr "Снимки с imagico.de: Скалы Шаг"
+msgid "imagico.de: Shag Rocks"
+msgstr ""
 
 msgid "Catastro Spain"
 msgstr "Кадастровая карта Испании"
@@ -27284,8 +27366,8 @@ msgstr "IDEIB - Балеарские острова"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Канарские острова"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
-msgstr "Снимки с imagico.de: Адамов Мост"
+msgid "imagico.de: Adams Bridge"
+msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr ""
@@ -27381,9 +27463,8 @@ msgstr "Кантон Базель-Штадт 2017"
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr "Кантон Базель - ландшафт 10см (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: Центральные Восточные Альпы, конец сентября 2016"
 
 msgid ""
 "Up-to-date image for glacier mapping - beware of some fresh snow at higher "
@@ -27392,6 +27473,13 @@ 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"
 
@@ -27412,8 +27500,8 @@ msgstr "Тайвань - данные о земельных участках"
 msgid "NLSC Open Data WMTS"
 msgstr "NLSC Open Data WMTS"
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
-msgstr "Снимки с imagico.de: гора Килиманджаро, 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
+msgstr ""
 
 msgid "Aşgabat (high resolution)"
 msgstr "Ашхабад (высокое разрешение)"
@@ -27483,8 +27571,8 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "U.S. Forest Service - дороги"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
-msgstr "Снимки с imagico.de: Аляскинский хребет"
+msgid "imagico.de: Alaska Range"
+msgstr ""
 
 msgid ""
 "Recent summer image of the Alaska Range for mapping natural features (true "
@@ -27493,14 +27581,14 @@ msgstr ""
 "Недавние летние снимки Аляскинского хребта для картографирования природных "
 "объектов (естественные цвета)"
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
-msgstr "Снимки с imagico.de: Богословский остров"
+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"
-msgstr "Снимки с imagico.de: Залив Кука"
+msgid "imagico.de: Cook Inlet"
+msgstr ""
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
 msgstr "Приливные отмели и ледники на окрестных горах (естественные цвета)"
@@ -27602,8 +27690,15 @@ msgstr ""
 "естественных цветах  и ближней ИК-области (4 диапазона - R, G, B, IR), "
 "охватывающих  округи Нью-Касл, Кент и Сассекс штата Делавэр."
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
-msgstr "Снимки с imagico.de: горы Рувензори"
+msgid "NYS Orthos Online"
+msgstr "Ортоснимки штата Нью-Йорк"
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr "Цифровые ортоснимки штата Нью-Йорк в высоком разрешении (1 фут)"
+
+msgid "imagico.de: Rwenzori Mountains"
+msgstr ""
 
 msgid ""
 "Recent image of most of the remaining Rwenzori Mountains glaciers (false "
@@ -27612,8 +27707,8 @@ msgstr ""
 "Недавние снимки большинства оставшихся ледников гор Рувензори (ИК в "
 "псевдоцветах)"
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
-msgstr "Снимки с imagico.de: горы Рувензори, 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
+msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Украина - ортофото 2012"
@@ -27627,6 +27722,12 @@ msgstr "Украина - Киев 2014 (DZK)"
 msgid "7th Series (OS7)"
 msgstr "7-й выпуск (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr "Гэмпшир (инфракрасные снимки в псевдоцветах)"
+
+msgid "Hampshire Aerial RGB"
+msgstr "Гэмпшир (снимки в RGB)"
+
 msgid "OS New Popular Edition historic"
 msgstr "OS New Popular Edition историческая"
 
@@ -28810,49 +28911,44 @@ msgstr "{0} должно быть целым числом между -5 и 5"
 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 ""
+"необычное значение {0}: используйте . вместо , в качестве десятичного "
+"разделителя"
+
 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}: по умолчанию в метрах; разделитель - точка; единицы измерения "
-"отделяются пробелом"
+"необычное значение {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}: по умолчанию тонны; разделитель — точка; при указании единицы измерения "
-"ставьте перед ней пробел"
+"необычное значение {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}: по умолчанию километры; разделитель — точка; при указании единицы "
-"измерения ставьте перед ней пробел"
+"необычное значение {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 "{0} должно быть числом в метрах, без единиц измерения"
 
@@ -28971,6 +29067,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 "Показывать названия улиц (при  крупных масштабах)"
 
@@ -29028,6 +29127,9 @@ msgstr ""
 "Автоматически присваивает адреса выделенным объектам в Австрии. Данные: © "
 "Ö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."
@@ -29071,6 +29173,9 @@ msgstr ""
 "Реализует командную строку с возможностью создания своих команд. Стандартные "
 "команды можно скачать по ссылке."
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr "Инструмент для объединения данных (поиска совпадений и слияния)."
 
@@ -29128,6 +29233,13 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Обработка французского EPCIs (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+"Предоставляет более мощную шину событий, чем традиционная регистрация "
+"обработчиков событий"
+
 msgid "Use external scripts in JOSM"
 msgstr "Использование внешних сценариев в JOSM"
 
@@ -29342,6 +29454,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr "Открытие GPX/OSM файлов, соответствующие области, видимой на экране"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -30225,584 +30340,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 ""
-"{0} последовательностей, каждая содержит от {1} до {2} снимков (ø {3})"
-
-msgid "{0} imported images"
-msgstr "{0} импортированных снимков"
-
-msgid "{0} downloaded images"
-msgstr "{0} скачанных снимков"
-
-msgid "{0} images in total"
-msgstr "{0} снимков всего"
-
-msgid "{0} images in {1} sequences"
-msgstr "{0} снимков в {1} последовательностях"
-
-msgid "Mapillary object layer"
-msgstr "Слой объектов Mapillary"
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr "Отображает слой с объектами карты, обнаруженными Mapillary"
-
-msgid "Open Mapillary layer"
-msgstr "Открыть слой Mapillary"
-
-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 ""
-"{0} снимков отправлено, идентификатор пакета правок: {1}, состояние: {2}"
-
-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 "Отправить снимки Mapillary"
-
-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 "Нажмите \"{0}\" для скачивания изображений"
-
-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 "Остановить прогулку"
-
-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 ""
-"При открытии снимка Mapillary в браузере показывать редактор размытий вместо "
-"просмотра снимка"
-
-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 "Какие слои с изображениями вы хотите импортировать в слой Mapillary?"
-
-msgid "Import"
-msgstr "Импортировать"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr "Не удалось импортировать геотегированный снимок в слой Mapillary!"
-
-msgid "{0} ({1} images)"
-msgstr "{0} ({1} снимков)"
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr ""
-"Из какого источника вы хотите импортировать изображения в слой Mapillary?"
-
-msgid "There are currently no layers with geotagged images!"
-msgstr "Нет слоёв с геопривязанными изображениями!"
-
-msgid "Images from my file system"
-msgstr "Изображения из моей файловой системы"
-
-msgid "Select the images you want to import"
-msgstr "Выберите изображения, которые вы хотите импортировать"
-
-msgid "All images in a directory"
-msgstr "Все изображения в каталоге"
-
-msgid "Select directory to import images from"
-msgstr "Выберите каталог для импорта изображений"
-
-msgid "From existing image layer"
-msgstr "Из существующего слоя изображений"
-
-msgid "Import exception"
-msgstr "Ошибка импорта"
-
-msgid "Could not import the image ''{0}''!"
-msgstr "Не удалось импортировать изображение ''{0}''!"
-
-msgid "Could not import the directory ''{0}''!"
-msgstr "Не удалось импортировать каталог ''{0}''!"
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr "Тег с ключом <i>{0}</i> уже есть у выделенного объекта OSM."
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-"Вы действительно хотите заменить текущее значение <i>{0}</i> на новое "
-"значение <i>{1}</i>?"
-
-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 ""
-"Модуль Mapillary теперь использует отдельную панель для показа "
-"дополнительной информации (типа идентификатора снимка) и действий для "
-"текущего выделенного снимка Mapillary (например, просмотра его в браузере)."
-
-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 ""
-"Показывает подробную информацию о текущем выделенном снимке Mapillary"
-
-msgid "Show detections on top of image"
-msgstr "Показывать обнаруженные поверх снимка"
-
-msgid "View in browser"
-msgstr "Открыть в браузере"
-
-msgid "Copy key"
-msgstr "Копировать ID"
-
-msgid "Add Mapillary tag"
-msgstr "Добавить тег Mapillary"
-
-msgid "Image detections"
-msgstr "Обнаружение знаков"
-
-msgid "Image actions"
-msgstr "Действия со снимком"
-
-msgid "Image key"
-msgstr "Идентификатор снимка"
-
-msgid "Sequence key"
-msgstr "Идентификатор последовательности"
-
-msgid "{0} detections"
-msgstr "Обнаружено: {0}"
-
-msgid "image has no key"
-msgstr "у снимка нет идентификатора"
-
-msgid "unknown user"
-msgstr "неизвестный пользователь"
-
-msgid "sequence has no key"
-msgstr "у последовательности нет идентификатора"
-
-msgid "Could not open the URL {0} in a browser"
-msgstr "Не удалось открыть URL {0} в браузере"
-
-msgid "Downloading map objects…"
-msgstr "Скачивание объектов карты…"
-
-msgid "All map objects loaded."
-msgstr "Все объекты карты загружены."
-
-msgid "Too many map objects, zoom in to see all."
-msgstr "Слишком много объектов на карте. Приблизьте, чтобы увидеть все."
-
-msgid "Downloading map objects failed!"
-msgstr "Не удалось скачать объекты карты!"
-
-msgid "Mapillary objects"
-msgstr "Объекты Mapillary"
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr "Отображает объекты, обнаруженные Mapillary в своих снимках улиц"
-
-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 "Не удалось выполнить чтение из URL {0}!"
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-"{0}\n"
-"Не удалось прочитать объекты карты из URL\n"
-"{1}!"
-
-msgid "everything in the visible area"
-msgstr "всё в видимой области"
-
-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 ""
-"Остановлено скачивание снимков на слой Mapillary, так как запрошенная "
-"область слишком велика!"
-
-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 ""
-"Для решения этой проблемы можно переключиться в режим загрузки ''{0}'' и "
-"скачать снимки Mapillary для меньшей части карты."
-
-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"
 
@@ -31629,6 +31166,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 ""
+"Возможные преобразования: точка->точка, точка->линия, точка->мультиполигон, "
+"линия->линия."
+
+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 "Генерализация зданий"
 
@@ -31665,9 +31309,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 "Данные: {0}"
+
+msgid "Set building shape to rectangle"
+msgstr ""
+
+msgid "Set buildings shape to rectangle"
+msgstr ""
+
 msgid "Set buildings size"
 msgstr "Задать размеры зданий"
 
@@ -31680,8 +31345,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 "Шаг длины:"
@@ -32432,6 +32106,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 "Объединение"
 
@@ -32957,6 +32643,9 @@ msgstr "Открыть панель GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Приблизьте, чтобы увидеть сообщения"
 
+msgid "Login"
+msgstr "Войти"
+
 msgid "Enable autologin"
 msgstr "Входить автоматически"
 
@@ -32990,24 +32679,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 "Только положение"
 
@@ -33099,6 +32779,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"
 
@@ -33838,8 +33521,27 @@ 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 ""
+"Сначала нажмите пробел, чтобы добавить объект с ролью \"outer\" к отношению."
+
+msgid "Relation-Error"
+msgstr "Ошибка в отношении"
+
+msgid "No data selected."
+msgstr "Не выбраны данные."
+
+msgid "No relation or no relation member with role \"outer\" selected."
+msgstr "Не выделено отношение или участник отношения с ролью \"outer\"."
 
 msgid "POWER"
 msgstr "ВКЛ./ВЫКЛ."
@@ -33871,36 +33573,104 @@ msgstr "Значение тега ref, если выбран объект room"
 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 "Выбор уровня"
+"<html> Введите номер для нового добавляемого этажа.<br>  <i>Информация</i>: "
+"<br> При нажатии кнопки OK вы перейдёте в режим рисования.<br>Чтобы "
+"закончить новый объект, нажмите пробел. Теги для нового уровня<br>будут "
+"добавлены автоматически. </html>"
 
-msgid "Lowest Level"
-msgstr "Самый нижний уровень"
+msgid "level number:"
+msgstr "Номер этажа:"
 
-msgid "The lowest level of your building."
-msgstr "Самый нижний уровень здания."
+msgid "Example: ''2'' or ''3''"
+msgstr "Пример: ''2'' или ''3''"
 
-msgid "Highest Level"
-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 "<html><b>?</strong></b>"
+
+msgid "Show Help-Browser."
+msgstr "Показать справку."
+
+msgid "Level name"
+msgstr "Имя этажа"
+
+msgid "Sets optional name tag for a level."
+msgstr "Необязательное название для этажа (тег level_name)"
+
+msgid "Working level: NONE"
+msgstr "Рабочий этаж: НЕТ"
+
+msgid "Shows the current working level."
+msgstr "Показывает текущий рабочий этаж."
+
+msgid "Deactivate automatic level tagging."
+msgstr "Отключить автоматическое добавление тегов для этажей."
+
+msgid "Sets the name tag."
+msgstr "Значение тега name."
+
+msgid "Sets the referance tag."
+msgstr "Значение тега ref."
+
+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 ""
+"Задаёт значение тега repeat_on, если выделен объект с тегом highway. "
+"Указывайте значение так: -3-4, или -2--3, или 5-6 ."
+
+msgid "OUTER"
+msgstr "OUTER"
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+"Инструмент создания мультиполигона с ролью: outer. Для завершения нажмите "
+"пробел."
+
+msgid "INNER"
+msgstr "INNER"
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+"Инструмент создания мультиполигонов с ролью: inner. Для завершения нажмите "
+"пробел. Для добавления к отношению выделите \"outer\" и нажмите Enter."
+
+msgid "Deactivate multipolygon function."
+msgstr "Деактивировать фукнции создания мультиполигона."
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr "Добавить выбранные теги и/или отношения к объекту."
+
+msgid "Working level: {0}"
+msgstr "Рабочий этаж: {0}"
+
 msgid "InfoMode"
 msgstr "InfoMode"
 
@@ -35069,6 +34839,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"
 
@@ -35351,6 +35142,8 @@ msgstr "Не удалось обработать файл ''{0}'':"
 msgid ""
 "Writing position information to image files... Estimated time left: {0}"
 msgstr ""
+"Запись информации о местоположении в файлы изображений... Ожидаемое время: "
+"{0}"
 
 msgid "File could not be deleted!"
 msgstr "Файл не может быть удалён!"
@@ -35412,6 +35205,9 @@ msgstr "Редактировать GPS-данные снимка"
 msgid "Please select an image first."
 msgstr "Сначала выберите изображение."
 
+msgid "No image selected"
+msgstr "Изображение не выбрано"
+
 msgid "(Empty values delete the according fields.)"
 msgstr "(Пустые значения удаляют соответствующие поля.)"
 
@@ -36187,6 +35983,9 @@ msgstr "неявный"
 msgid "State"
 msgstr "Штат"
 
+msgid "pending"
+msgstr "в ожидании"
+
 msgid "[incomplete]"
 msgstr "[неполный]"
 
@@ -36606,12 +36405,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>"
@@ -36972,12 +36765,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 "Подсветить"
 
@@ -38718,48 +38505,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 "Заменить участие в отношении"
 
@@ -38839,9 +38584,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/sk.po b/i18n/po/sk.po
index 7444f11..ad0c1a2 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-29 23:39+0000\n"
-"Last-Translator: aceman444 <Unknown>\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-27 14:41+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Slovak <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:01+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:01+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: sk\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1037,8 +1037,8 @@ msgstr "Vložte URL pre sťahovanie:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Vložte adresu URL z ktorej budú dáta sťahované"
 
-msgid "Separate Layer"
-msgstr "Samostatná vrstva"
+msgid "Download as new layer"
+msgstr "Načítať na novú vrstvu"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Vyberte ak dáta majú byť stiahnuté na novú vrstvu"
@@ -2465,17 +2465,17 @@ msgstr "Konvertovať na vrstvu GPX od posledného člena"
 
 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 ""
-"Rekurzívne zlúčiť túto reláciu do jednej stopy GPX, začínajúc prvým členom "
-"po posledného."
+"Rekurzívne zarovnať túto reláciu do jednej gpx stopy, od prvého člena po "
+"posledného."
 
 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 ""
-"Rekurzívne zlúčiť túto reláciu do jednej stopy GPX, začínajúc posledným "
-"členom po prvého."
+"Rekurzívne zarovnať túto reláciu do jednej gpx stopy, od posledného člena po "
+"prvého."
 
 msgid "Selected Relations"
 msgstr "Vybrané relácie"
@@ -8988,9 +8988,6 @@ msgstr "Hodnota pre zemepisnú šírku v rozsahu [-90,90] povinná."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Hodnota pre zemepisnú dížku v rozsahu [-180,180] povinná."
 
-msgid "Download as new layer"
-msgstr "Načítať na novú vrstvu"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10675,6 +10672,9 @@ msgstr "Nenašli sa žiadne dáta v súbore ''{0}''."
 msgid "Open OSM file"
 msgstr "Otvoriť OSM súbor"
 
+msgid "OSM Server Files XZ compressed"
+msgstr "Súbory OSM servera skomprimované XZ"
+
 msgid "Validation Error Files"
 msgstr "Súbory s chybami validátora"
 
@@ -14037,9 +14037,6 @@ msgstr "Vzdialené ovládanie"
 msgid "Settings for the remote control feature."
 msgstr "Nastavenie pre diaľkovo ovládané funkcie."
 
-msgid "Download objects to new layer"
-msgstr "Stiahnuť objekty do novej vrstvy"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Potvrdiť všetky diaľkovo ovládané manuálne činnosti"
 
@@ -15975,6 +15972,12 @@ msgstr "Zachovať plugin"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Kliknite pre zachovanie pluginu ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Nepodarilo sa nainštalovať plugin \"{0}\" z dočasne stiahnutého súboru "
+"\"{1}\". {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Nepodarilo sa odstránenie zastaraných pluginov \"{0}\"."
 
@@ -15986,12 +15989,6 @@ msgstr ""
 "inštaláciu. JOSM bude ďalej používať starú verziu pluginu."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Nepodarilo sa nainštalovať plugin \"{0}\" z dočasne stiahnutého súboru "
-"\"{1}\". {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -18027,10 +18024,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "na streche"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "v schránke"
-
 msgid "Start date"
 msgstr "Dátum dokončenia stavby"
 
@@ -19541,6 +19534,9 @@ msgstr "Bio nafta"
 msgid "Octane 80"
 msgstr "80 oktánový"
 
+msgid "Octane 87"
+msgstr "87 oktánový"
+
 msgid "Octane 91"
 msgstr "91 oktánový"
 
@@ -19562,6 +19558,9 @@ msgstr "E10 (10% Etanol mix)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Etanol mix)"
 
+msgid "Ethanol (alcohol)"
+msgstr "Etanol (alkohol)"
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Skvapalnený ropný plyn)"
 
@@ -20867,7 +20866,7 @@ msgid "Town Hall"
 msgstr "Radnica (obecný úrad)"
 
 msgid "Community Centre"
-msgstr "Komunitné centrum"
+msgstr "Kultúrny dom/Komunitné centrum"
 
 msgid "Embassy"
 msgstr "Veľvyslanectvo"
@@ -22217,6 +22216,12 @@ msgstr "Fontána"
 msgid "Water Well"
 msgstr "Studňa"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Maják"
 
@@ -25317,6 +25322,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"
 
@@ -25398,8 +25430,8 @@ msgstr "OSM Inspector: Addresy"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM Inspector: Pobrežie (EU)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr "imagico.de OSM obrázky pre mapovanie: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
+msgstr "imagico.de: Prokletije Mountains"
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
@@ -25413,30 +25445,51 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr "Ulice a budovy poskytnuté mestom Tirana, prevádzkuje Open Labs"
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
-msgstr "imagico.de OSM obrázky pre mapovanie: Južné transantarktické hory"
+msgid "imagico.de: Southern Transantarctic Mountains"
+msgstr "imagico.de: Južné transantarktické hory"
 
 msgid ""
 "Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
-msgstr "imagico.de OSM obrázky pre mapovanie: Pensacola Mountains"
+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 obrázky pre mapovanie: 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 ""
 
-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 ""
 
@@ -25575,13 +25628,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"
@@ -25614,15 +25667,15 @@ msgstr "LPI NSW Administratívne hranice štátnych lesov"
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW Administratívne hranice chránených oblastí NPWS"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
-msgstr "imagico.de OSM obrázky pre mapovanie: Northwest Heard Island"
+msgid "imagico.de: Northwest Heard Island"
+msgstr "imagico.de: Northwest Heard Island"
 
 msgid ""
 "Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Heard Island coast"
-msgstr "imagico.de OSM obrázky pre mapovanie: Heard Island coast"
+msgid "imagico.de: Heard Island coast"
+msgstr "imagico.de: Heard Island coast"
 
 msgid ""
 "Recent image of Heard island with interior mostly cloud covered but mostly "
@@ -25687,8 +25740,8 @@ msgstr "VoGIS: Plán využitia územia"
 msgid "VoGIS: Höhen und Gelände"
 msgstr "VoGIS: Výšky a pozemky"
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
-msgstr "imagico.de OSM obrázky pre mapovanie: 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ý štýl)"
@@ -25774,14 +25827,14 @@ msgstr "Zastávky autobusov TEC"
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "Benin: Cotonou Pleiade 2016"
 
-msgid "imagico.de OSM images for mapping: Cotonou"
-msgstr "imagico.de OSM obrázky pre mapovanie: Cotonou"
+msgid "imagico.de: Cotonou"
+msgstr "imagico.de: Cotonou"
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
-msgstr "imagico.de OSM obrázky pre mapovanie: Bouvet Island"
+msgid "imagico.de: Bouvet Island"
+msgstr "imagico.de: Bouvet Island"
 
 msgid "For more accurate coastline and glacier mapping (true color)"
 msgstr ""
@@ -25948,43 +26001,42 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna cesty"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
-msgstr "imagico.de OSM obrázky pre mapovanie: Eastern Devon Island coast"
+msgid "imagico.de: Eastern Devon Island coast"
+msgstr "imagico.de: Eastern Devon Island coast"
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
-msgstr "imagico.de OSM obrázky pre mapovanie: Northern Ellesmere Island"
+msgid "imagico.de: Northern Ellesmere Island"
+msgstr "imagico.de: Northern Ellesmere Island"
 
 msgid ""
 "Assembled from July 2012 ASTER imagery (true color with estimated blue)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
+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"
-msgstr "imagico.de OSM obrázky pre mapovanie: 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 ""
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
-msgstr "imagico.de OSM obrázky pre mapovanie: 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 "
 "though so no use for glacier mapping (false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
-msgstr "imagico.de OSM obrázky pre mapovanie: Volcán Calbuco"
+msgid "imagico.de: Volcán Calbuco"
+msgstr "imagico.de: Volcán Calbuco"
 
 msgid "Image from after the 2015 eruption (true color)"
 msgstr ""
@@ -26031,15 +26083,15 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
-msgstr "imagico.de OSM obrázky pre mapovanie: El Altar"
+msgid "imagico.de: El Altar"
+msgstr "imagico.de: El Altar"
 
 msgid ""
 "2007 ASTER image offering better glacier coverage than common sources (true "
 "color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
 msgstr ""
 
 msgid ""
@@ -26210,33 +26262,27 @@ msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr "Metropola Ruhr: Letecké snímky (10 cm)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats"
-msgstr ""
-"imagico.de OSM obrázky pre mapovanie: Severné Nemecko západné pobrežné "
-"prílivové oblasti"
+msgid "imagico.de: Northern German west coast tidalflats"
+msgstr "imagico.de: Severné Nemecko západné pobrežné prílivové oblasti"
 
 msgid ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
 "and shoals (true color)"
 msgstr ""
 
-msgid ""
-"imagico.de OSM images for mapping: Northern German west coast tidalflats "
-"(infrared)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
 msgstr ""
-"imagico.de OSM obrázky pre mapovanie: Severné Nemecko západné pobrežné "
-"prílivové oblasti (infračervené)"
+"imagico.de: Severné Nemecko západné pobrežné prílivové oblasti (infračervené)"
 
 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"
@@ -26269,72 +26315,67 @@ msgstr "Mainz najnovšie letecké snímky"
 msgid "Munich latest aerial imagery 60cm"
 msgstr "Mníchov najnovšie letecké snímky 60cm"
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
-msgstr "imagico.de OSM obrázky pre mapovanie: Qasigiannguit"
+msgid "imagico.de: Qasigiannguit"
+msgstr "imagico.de: Qasigiannguit"
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
-msgstr "imagico.de OSM obrázky pre mapovanie: Thule Air Base"
+msgid "imagico.de: Thule Air Base"
+msgstr "imagico.de: Thule Air Base"
 
 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"
-msgstr "imagico.de OSM obrázky pre mapovanie: Greenland mosaic"
+msgid "imagico.de: Greenland mosaic"
+msgstr "imagico.de: Greenland mosaic"
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
-msgstr "imagico.de OSM obrázky pre mapovanie: May 2013 off-nadir Landsat"
+msgid "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 "
 "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"
-msgstr "imagico.de OSM obrázky pre mapovanie: 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 "
@@ -26401,21 +26442,21 @@ msgstr "OpenStreetMap Maďarsko (turistické chodníky)"
 msgid "Hillshade Hungary"
 msgstr "Tieňované svahy Maďarsko"
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
-msgstr "imagico.de OSM obrázky pre mapovanie: Eastern Iceland"
+msgid "imagico.de: Eastern Iceland"
+msgstr "imagico.de: Eastern Iceland"
 
 msgid "Missing islets and inaccurate coast (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
-msgstr "imagico.de OSM obrázky pre mapovanie: Rann of Kutch"
+msgid "imagico.de: Rann of Kutch"
+msgstr "imagico.de: Rann of Kutch"
 
 msgid ""
 "Land/water distinction difficult to properly map based on Bing/Mapbox images "
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -26423,27 +26464,27 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
-msgstr "imagico.de OSM obrázky pre mapovanie: 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 "
 "also use additional detail (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
-msgstr "imagico.de OSM obrázky pre mapovanie: Bakun Reservoir"
+msgid "imagico.de: Bakun Reservoir"
+msgstr "imagico.de: Bakun Reservoir"
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Batam"
-msgstr "imagico.de OSM obrázky pre mapovanie: Batam"
+msgid "imagico.de: Batam"
+msgstr "imagico.de: Batam"
 
 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 ""
@@ -26548,13 +26589,13 @@ msgstr "Japonsko GSI ortofoto"
 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 ""
@@ -26562,7 +26603,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)"
@@ -26656,13 +26697,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 ""
 
@@ -26750,6 +26784,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 ""
 
@@ -26758,6 +26806,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 ""
 
@@ -26765,14 +26837,14 @@ 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"
-msgstr "imagico.de OSM obrázky pre mapovanie: 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 "
@@ -26785,7 +26857,7 @@ msgstr "Pásmo Gazy - Pléiades - 2014/07/06"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Pásmo Gazy - Pléiades - 2014/07/06 (NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -26793,32 +26865,29 @@ msgid ""
 "image alignment (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
-msgstr "imagico.de OSM obrázky pre mapovanie: Panama Canal"
+msgid "imagico.de: Panama Canal"
+msgstr "imagico.de: Panama Canal"
 
 msgid "Images of the new locks (but partly cloudy) (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Vanatinai"
-msgstr "imagico.de OSM obrázky pre mapovanie: Vanatinai"
+msgid "imagico.de: Vanatinai"
+msgstr "imagico.de: Vanatinai"
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: New Ireland"
-msgstr "imagico.de OSM obrázky pre mapovanie: New Ireland"
+msgid "imagico.de: New Ireland"
+msgstr "imagico.de: New Ireland"
 
 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"
-msgstr ""
-"imagico.de OSM obrázky pre mapovanie: 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 ""
@@ -26886,7 +26955,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"
@@ -26919,6 +26991,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 ""
 
@@ -26967,33 +27045,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 ""
@@ -27001,7 +27077,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)"
@@ -27047,26 +27123,26 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "Južná Afrika CD:NGI Letecké"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
-msgstr "imagico.de OSM obrázky pre mapovanie: Leskov Island ASTER"
+msgid "imagico.de: Leskov Island ASTER"
+msgstr "imagico.de: Leskov Island ASTER"
 
 msgid "Missing in other image sources (true color with estimated blue)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Scott Island"
-msgstr "imagico.de OSM obrázky pre mapovanie: Scott Island"
+msgid "imagico.de: Scott Island"
+msgstr "imagico.de: Scott Island"
 
 msgid "Missing in other image sources (true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
-msgstr "imagico.de OSM obrázky pre mapovanie: Leskov Island Landsat"
+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 obrázky pre mapovanie: 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 obrázky pre mapovanie: Shag Rocks"
+msgid "imagico.de: Shag Rocks"
+msgstr "imagico.de: Shag Rocks"
 
 msgid "Catastro Spain"
 msgstr "Kataster Španielsko"
@@ -27089,7 +27165,7 @@ msgstr "IDEIB - Baleárske ostrovy"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Kanárske ostrovy"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -27185,7 +27261,7 @@ msgstr ""
 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 ""
 
 msgid ""
@@ -27193,6 +27269,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"
 
@@ -27211,7 +27294,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)"
@@ -27273,21 +27356,21 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "Cesty Lesnej služby U.S.A."
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
-msgstr "imagico.de OSM obrázky pre mapovanie: Alaska Range"
+msgid "imagico.de: Alaska Range"
+msgstr "imagico.de: Alaska Range"
 
 msgid ""
 "Recent summer image of the Alaska Range for mapping natural features (true "
 "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)"
@@ -27376,15 +27459,22 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
-msgstr "imagico.de OSM obrázky pre mapovanie: Rwenzori Mountains"
+msgid "NYS Orthos Online"
+msgstr ""
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+
+msgid "imagico.de: Rwenzori Mountains"
+msgstr "imagico.de: Rwenzori Mountains"
 
 msgid ""
 "Recent image of most of the remaining Rwenzori Mountains glaciers (false "
 "color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
 msgstr ""
 
 msgid "Ukraine - Orthophotomaps 2012"
@@ -27399,6 +27489,12 @@ msgstr "Ukrajina - Kyjev 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"
 
@@ -27991,7 +28087,7 @@ msgstr "OS Plány miest, Stranraer 1847 (NLS)"
 msgid ""
 "Detailed town plan of Stranraer 1847, courtesy of National Library of "
 "Scotland."
-msgstr ""
+msgstr "https://bugzilla.mozilla.org/show_bug.cgi?id=1427188"
 
 msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
 msgstr "OS Plány miest, Stranraer 1863-1877 (NLS)"
@@ -28263,7 +28359,7 @@ msgid "{0} on a node. Should be used on a way."
 msgstr "{0} na bode. Malo by byť použité na ceste."
 
 msgid "{0} on a node. Should be used on a way or relation."
-msgstr ""
+msgstr "{0} na bode. Malo by byť použité na ceste alebo relácii."
 
 msgid "{0} on a node. Should be drawn as an area."
 msgstr "{0} na bode. Malo by byť zakreslené ako oblasť."
@@ -28284,6 +28380,8 @@ msgid ""
 "Object at Position 0.00E 0.00N. There is nothing at this position except an "
 "already mapped weather buoy."
 msgstr ""
+"Objekt na pozícii  0,00S 0,00V. Na tomto mieste však nič nie je, okrem už "
+"zakreslenej meteorologickej bóje."
 
 msgid "{0} together with {1} on a node. Remove {0}."
 msgstr "{0} spolu s {1} na bode. Odstráňte {0}."
@@ -28356,10 +28454,11 @@ msgstr ""
 "použite namiesto toho {1} + {2}."
 
 msgid "Ferry route is not connected to the road network or branches."
-msgstr ""
+msgstr "Trasa trajektu nie je pripojená k cestnej sieti ani odbočke trasy."
 
 msgid "Ferry route is not connected to a ferry terminal or branches."
 msgstr ""
+"Trasa trajektu nie je pripojená k terminálu trajektu ani k odbočke trasy."
 
 msgid "abbreviated street name"
 msgstr "skrátený názov ulice"
@@ -28410,60 +28509,45 @@ msgid "numerical key"
 msgstr "číselný kľúč"
 
 msgid "{0} value with + sign"
-msgstr ""
+msgstr "{0} hodnota so znamienkom +"
 
 msgid "{0} should be an integer value between -5 and 5"
-msgstr ""
+msgstr "{0} by mala byť celočíselná hodnota medzi -5 a 5"
 
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr "{0} by mal mať len čísla, prípadne s krokmi po 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}: metre sú predvolené; desatinným oddeľovačom je bodka; ak používate "
-"jednotku, zadajte pred ňu medzeru"
 
 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}: predvolenou jednotkou je tona; desatinným oddeľovačom je bodka; ak "
-"uvádzate jednotky, oddeľte ich medzerou"
 
-msgid "unusual {0} format"
-msgstr "neobvyklý formát pre {0}"
+msgid "unusual value of {0}"
+msgstr "nezvyčajná 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}: predvolenou jednotkou je kilometer; desatinným oddeľovačom je bodka; ak "
-"uvádzate jednotky, oddeľte ich medzerou"
 
 msgid "voltage should be in volts with no units/delimiter/spaces"
 msgstr ""
 "napätie by malo byť vo Voltoch bez medzier, oddeľovačov a merných jednotiek"
 
-msgid "unusual {0} specification"
-msgstr "neobvyklé zadanie pre {0}"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr "nezvyčajný rozchod koľajníc; použite milimetre bez oddeľovačov"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr ""
-"nezvyčajná hodnota sklonu; použite percentá, stupne alebo \"up\" alebo "
-"\"down\""
-
 msgid "{0} must be a numeric value"
 msgstr "{0} musí byť numerická hodnota"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} musí byť kladné celé číslo"
 
-msgid "unusual value of {0}"
-msgstr "nezvyčajná hodnota {0}"
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr "{0} musí byť číselná hodnota, v metroch a bez jednotiek"
 
@@ -28474,7 +28558,7 @@ msgid "{0} relation without {0} tag"
 msgstr "relácia {0} bez značky {0}"
 
 msgid "way with {0} is part of a bicycle route relation"
-msgstr ""
+msgstr "cesta s {0} je súčasťou relácie cyklotrasy"
 
 msgid "religion without denomination"
 msgstr "\"religion\" bez \"denomination\""
@@ -28510,7 +28594,7 @@ msgid "Nodes duplicating parent way tags"
 msgstr "Body duplikujúce značky cesty, ktorej sú súčasťou"
 
 msgid "{0} together with {1} and {2}. Remove {0}."
-msgstr ""
+msgstr "{0} spolu s {1} a {2}. Odstráňte {0}."
 
 msgid ""
 "wikipedia tag has no language given, use ''wikipedia''=''language:page "
@@ -28581,6 +28665,9 @@ msgstr "Skryť ikony pri malom priblížení"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "Menej výrazné symboly bodov pri malom priblížení"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "Zobrazovať názvy ulíc (pri vysokom priblížení)"
 
@@ -28637,6 +28724,9 @@ msgstr ""
 "Automaticky priradí adresy vybraným objektom v Rakúsku. Dáta © "
 "Ö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."
@@ -28682,6 +28772,9 @@ msgstr ""
 "Doplní príkazový riadok a aktivuje vkladanie príkazov. Pozri odkaz na "
 "štandardné príkazy (oblúku, kružnica atď.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr "Nástroj na zjednotenie dát (porovnanie a zlúčenie)."
 
@@ -28737,6 +28830,11 @@ msgstr "Zobrazuje výškový profil a niektoré štatistické údaje z GPX stopy
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Manipulácia francúzskeho EPCIS (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Použiť externé skripty v JOSMe"
 
@@ -28942,6 +29040,9 @@ msgstr ""
 "Povoľuje otvorenie gpx/osm súborov, ktoré križujú súčasnú viditeľnú plochu "
 "na obrazovke"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -29802,570 +29903,6 @@ msgstr "Import georeferenčného obrázka"
 msgid "Error while creating image layer: "
 msgstr "Chyba pri vytváraní obrazu vrstvy: "
 
-msgid "Mapillary Images"
-msgstr "Obrázky z Mapillary"
-
-msgid "Mapillary layer"
-msgstr "Vrstva 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 "Mapillary - vrstva objektov"
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr "Zobrazí vrstvu s mapovými objektami, ktoré identifikoval Mapillary"
-
-msgid "Open Mapillary layer"
-msgstr ""
-
-msgid "Mapillary"
-msgstr "Mapillary"
-
-msgid "Download Mapillary images in current view"
-msgstr "Stiahnuť obrázky z Mapillary pre aktuálny pohľad"
-
-msgid "Export pictures"
-msgstr "Exportovať obrázky"
-
-msgid "Export Mapillary pictures"
-msgstr "Exportovať obrázky Mapillary"
-
-msgid "Export images"
-msgstr "Exportovať obrázky"
-
-msgid "Import pictures"
-msgstr "Importovať obrázky"
-
-msgid "Import local pictures"
-msgstr "Importovať lokálne obrázky"
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Importovať obrázky do vrstvy Mapillary"
-
-msgid "Join mode"
-msgstr "Režim spájania"
-
-msgid "Join/unjoin pictures"
-msgstr "Spojiť/oddeliť obrázky"
-
-msgid "Submit changeset"
-msgstr "Odoslať sadu zmien"
-
-msgid "Submit the current changeset"
-msgstr "Odoslať aktuálnu sadu zmien"
-
-msgid "Submit the current changeset to Mapillary"
-msgstr "Odoslať aktuálnu sadu zmien do 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 "Odoslanie sady zmien zlyhalo 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 ""
-"Pri odosielaní sady zmien nastala výnimka. Ak sa to opakuje, zvážte "
-"nahlásenie chyby cez menu Pomocník. Ak sa táto správa zobrazila prvýkrát, "
-"skúste odoslanie znovu. Mohol to byť dočasný problém s pripojením na "
-"Internet."
-
-msgid "Upload Mapillary images"
-msgstr ""
-
-msgid "Walk mode"
-msgstr "Režim chôdze"
-
-msgid "Zoom to selected image"
-msgstr "Priblížiť na zvolený obrázok"
-
-msgid "Zoom to the currently selected Mapillary image"
-msgstr "Priblížiť na zvolený obrázok z Mapillary"
-
-msgid "Current Mapillary changeset"
-msgstr "Aktuálna sada zmien Mapillary"
-
-msgid "Open Mapillary changeset dialog"
-msgstr "Otvoriť okno pre sady zmien Mapillary"
-
-msgid "Mapillary changeset"
-msgstr "Sada zmien Mapillary"
-
-msgid "Submitting changeset to server…"
-msgstr "Odosiela sa sada zmien na server…"
-
-msgid "Export all images"
-msgstr "Exportovať všetky obrázky"
-
-msgid "Export selected sequence"
-msgstr "Exportovať vybranú postupnosť"
-
-msgid "Export selected images"
-msgstr "Exportovať vybrané obrázky"
-
-msgid "Rewrite imported images"
-msgstr "Prepísať importované obrázky"
-
-msgid "Select a directory"
-msgstr "Vybrať priečinok"
-
-msgid "Explore"
-msgstr "Preskúmať"
-
-msgid "Speed limit"
-msgstr "Rýchlostné obmedzenie"
-
-msgid "Give way"
-msgstr "Daj prednosť v jazde"
-
-msgid "No entry"
-msgstr "Zákaz vstupu"
-
-msgid "Intersection danger"
-msgstr ""
-
-msgid "Mandatory direction (any)"
-msgstr "Prikázaný smer jazdy"
-
-msgid "Uneven road"
-msgstr "Nerovná cesta"
-
-msgid "No parking"
-msgstr "Zákaz parkovania"
-
-msgid "No overtaking"
-msgstr "Zákaz predbiehania"
-
-msgid "Pedestrian crossing"
-msgstr "Priechod pre chodcov"
-
-msgid "No turn"
-msgstr "Zákaz odbočenia"
-
-msgid "Years"
-msgstr "Rokov"
-
-msgid "Months"
-msgstr "Mesiacov"
-
-msgid "Days"
-msgstr "Dní"
-
-msgid "Imported images"
-msgstr "Importované obrázky"
-
-msgid "Mapillary filter"
-msgstr "Filter Mapillary"
-
-msgid "Open Mapillary filter dialog"
-msgstr "Otvoriť okno filtra Mapillary"
-
-msgid "Not older than: "
-msgstr "Nie staršie ako: "
-
-msgid "Downloaded images"
-msgstr "Stiahnuté obrázky"
-
-msgid "Only images with signs"
-msgstr "Iba obrázky so značkami"
-
-msgid "Choose signs"
-msgstr "Zvoľte značky"
-
-msgid "Mapillary history"
-msgstr "História Mapillary"
-
-msgid "Open Mapillary history dialog"
-msgstr "Otvoriť okno histórie Mapillary"
-
-msgid "No image selected"
-msgstr "Nie je vybratý žiadny obrázok"
-
-msgid "Press \"{0}\" to download images"
-msgstr "Stlačte \"{0}\" pre stiahnutie obrázkov"
-
-msgid "Mapillary picture"
-msgstr "Obrázok Mapillary"
-
-msgid "Open Mapillary window"
-msgstr "Otvoriť okno Mapillary"
-
-msgid "Next picture"
-msgstr "Nasledujúci obrázok"
-
-msgid "Shows the next picture in the sequence"
-msgstr "Zobrazí nasledujúci obrázok v postupnosti"
-
-msgid "Previous picture"
-msgstr "Predchádzajúci obrázok"
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Zobrazí predchádzajúci obrázok v postupnosti"
-
-msgid "Jump to red"
-msgstr "Skočiť na červenú"
-
-msgid "Jumps to the picture at the other side of the red line"
-msgstr "Preskočí na obrázok na druhej strane červenej čiary"
-
-msgid "Jump to blue"
-msgstr "Skočiť na modrú"
-
-msgid "Jumps to the picture at the other side of the blue line"
-msgstr "Preskočí na obrázok na druhej strane modrej čiary"
-
-msgid "Stops the walk."
-msgstr "Zastaví chôdzu."
-
-msgid "Play"
-msgstr "Prehrať"
-
-msgid "Continues with the paused walk."
-msgstr "Pokračuje v pozastavenej chôdzi."
-
-msgid "Pause"
-msgstr "Pozastaviť"
-
-msgid "Pauses the walk."
-msgstr "Pozastaví chôdzu."
-
-msgid "Display hour when the picture was taken"
-msgstr "Zobraziť hodinu kedy bol obrázok zaznamenaný"
-
-msgid "Use 24 hour format"
-msgstr "Použiť 24-hodinový formát"
-
-msgid "Move to picture''s location with next/previous buttons"
-msgstr "Tlačidlom nasledujúci/predchádzajúci sa presunúť na pozíciu obrázka"
-
-msgid "Preview images when hovering its icon"
-msgstr "Zobraziť náhľady obrázkov pri prejdení nad ich ikonou"
-
-msgid "Cut off sequences at download bounds"
-msgstr "Odseknúť postupnosť na hranici stiahnutej oblasti"
-
-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 "Zapnúť experimentálne vyvíjané funkcie (môžu byť nestabilné)"
-
-msgid "Download mode"
-msgstr "Režim sťahovania"
-
-msgid "Number of images to be pre-fetched (forwards and backwards)"
-msgstr ""
-
-msgid "You are logged in as ''{0}''."
-msgstr "Ste prihlásený ako \"{0}\"."
-
-msgid "You are currently not logged in."
-msgstr "Nie ste prihlásený."
-
-msgid "Login"
-msgstr "Prihlásiť sa"
-
-msgid "Logout"
-msgstr "Odhlásiť sa"
-
-msgid "Go to setting and log in to Mapillary before uploading."
-msgstr "Pred odosielaním choďte do nastavení a prihláste sa do Mapillary."
-
-msgid "Upload selected sequence"
-msgstr "Odoslať vybranú postupnosť"
-
-msgid "Delete after upload"
-msgstr "Vymazať po odoslaní"
-
-msgid "Wait for full quality pictures"
-msgstr "Čakať na obrázky v plnej kvalite"
-
-msgid "Follow selected image"
-msgstr "Nasledovať vybraný obrázok"
-
-msgid "Go forward"
-msgstr "Prejsť dopredu"
-
-msgid "Which image layers do you want to import into the Mapillary layer?"
-msgstr "Ktoré vrstvy obrázkov chcete importovať do vrstvy Mapillary?"
-
-msgid "Import"
-msgstr "Importovať"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr ""
-"Nepodarilo sa importovať obrázok s geografickou polohou do vrstvy Mapillary!"
-
-msgid "{0} ({1} images)"
-msgstr ""
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr "Z akého zdroja chcete importovať obrázky do vrstvy Mapillary?"
-
-msgid "There are currently no layers with geotagged images!"
-msgstr "Nemáte žiadne vrstvy s obrázkami s geografickou polohou!"
-
-msgid "Images from my file system"
-msgstr "Obrázky z disku"
-
-msgid "Select the images you want to import"
-msgstr "Vyberte obrázky, ktoré chcete importovať"
-
-msgid "All images in a directory"
-msgstr "Všetky obrázky v priečinku"
-
-msgid "Select directory to import images from"
-msgstr "Zvoľte priečinok na importovanie obrázkov"
-
-msgid "From existing image layer"
-msgstr "Z existujúcej vrstvy obrázkov"
-
-msgid "Import exception"
-msgstr "Výnimka pri importe"
-
-msgid "Could not import the image ''{0}''!"
-msgstr "Nepodarilo sa importovať obrázok \"{0}\"!"
-
-msgid "Could not import the directory ''{0}''!"
-msgstr "Nepodarilo sa importovať priečinok \"{0}\"!"
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr "Značka s kľúčom <i>{0}</i> už na zvolenom OSM objekte existuje."
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-"Naozaj chcete nahradiť existujúcu hodnotu <i>{0}</i> novou hodnotou "
-"<i>{1}</i>?"
-
-msgid "Tag conflict"
-msgstr "Konflikt značiek"
-
-msgid "Key copied to clipboard"
-msgstr "Kľúč skopírovaný 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 ""
-"Plugin Mapillary teraz používa samostatný panel pre zobrazenie doplňujúcich "
-"informácií (ako kľúč obrázkov) a akcie pre zvolený obrázok Mapillary (napr. "
-"zobraziť v prehliadač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 ""
-"Môže byť aktivovaný kliknutím na ľavé tlačidlo naspodku tejto správy, alebo "
-"tlačidlo na paneli nástrojov vľavo, ktoré má rovnakú ikonu."
-
-msgid "I got it, close this."
-msgstr "Pochopil som, zavrieť."
-
-msgid "Image info"
-msgstr "Informácie o obrázku"
-
-msgid "Displays detail information on the currently selected Mapillary image"
-msgstr "Zobrazí detaily o práve zvolenom obrázku Mapillary"
-
-msgid "Show detections on top of image"
-msgstr "Zobraziť detekované objekty nad obrázkom"
-
-msgid "View in browser"
-msgstr "Zobraziť v prehliadači"
-
-msgid "Copy key"
-msgstr "Kopírovať kľúč"
-
-msgid "Add Mapillary tag"
-msgstr "Pridať značku Mapillary"
-
-msgid "Image detections"
-msgstr "Objekty detekované v obrázku"
-
-msgid "Image actions"
-msgstr "Akcie s obrázkom"
-
-msgid "Image key"
-msgstr "Kľúč obrázku"
-
-msgid "Sequence key"
-msgstr "Kľúč postupnosti"
-
-msgid "{0} detections"
-msgstr "{0} detekovaných objektov"
-
-msgid "image has no key"
-msgstr "obrázok nemá kľúč"
-
-msgid "unknown user"
-msgstr "neznámy používateľ"
-
-msgid "sequence has no key"
-msgstr "postupnosť nemá kľúč"
-
-msgid "Could not open the URL {0} in a browser"
-msgstr "Nepodarilo sa otvoriť adresu {0} v prehliadači"
-
-msgid "Downloading map objects…"
-msgstr "Sťahujú sa mapové objekty…"
-
-msgid "All map objects loaded."
-msgstr "Všetky mapové objekty stiahnuté."
-
-msgid "Too many map objects, zoom in to see all."
-msgstr ""
-"Príliš veľa mapových objektov. Priblížte oblasť, aby ste videli všetky."
-
-msgid "Downloading map objects failed!"
-msgstr "Sťahovanie mapových objektov zlyhalo!"
-
-msgid "Mapillary objects"
-msgstr "Objekty Mapillary"
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr "Zobrazí objekty detegované Mapillary z obrázkov ulíc"
-
-msgid "Deleted {0} image"
-msgid_plural "Deleted {0} images"
-msgstr[0] "{0} obrázkov vymazaných"
-msgstr[1] "{0} obrázok vymazaný"
-msgstr[2] "{0} obrázky vymazané"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "{0} obrázkov importovaných"
-msgstr[1] "{0} obrázok importovaný"
-msgstr[2] "{0} obrázky importované"
-
-msgid "2 images joined"
-msgstr "2 obrázky spojené"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "{0} obrázkov presunutých"
-msgstr[1] "{0} obrázok presunutý"
-msgstr[2] "{0} obrázky presunuté"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "{0} obrázkov otočených"
-msgstr[1] "{0} obrázok otočený"
-msgstr[2] "{0} obrázky otočené"
-
-msgid "2 images unjoined"
-msgstr "2 obrázky rozpojené"
-
-msgid "Could not read from URL {0}!"
-msgstr "Nepodarilo sa čítať z adresy {0}!"
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-"{0}\n"
-"Nepodarilo sa čítať mapové objekty z adresy\n"
-"{1}!"
-
-msgid "everything in the visible area"
-msgstr "všetko vo viditeľnej oblasti"
-
-msgid "areas with downloaded OSM-data"
-msgstr "oblasti s už stiahnutými údajmi OSM"
-
-msgid "only when manually requested"
-msgstr "len keď je požadované"
-
-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 "Sťahuje sa"
-
-msgid "Select mode"
-msgstr "Vyberte režim"
-
-msgid "Mapillary login"
-msgstr "Prihlásenie do Mapillary"
-
-msgid "Login successful, return to JOSM."
-msgstr "Prihlásenie úspešné, vráťte sa do JOSM."
-
-msgid "Supported image formats (JPG and PNG)"
-msgstr "Podporované formáty obrázkov (JPG a PNG)"
-
-msgid "Downloading Mapillary images"
-msgstr "Sťahujú sa obrázky Mapillary"
-
-msgid "Total Mapillary images: {0}"
-msgstr "Spolu obrázkov Mapillary: {0}"
-
-msgid "Submitting Mapillary Changeset"
-msgstr "Odosiela sa sada zmien Mapillary"
-
-msgid "No images found"
-msgstr "Nenašli sa žiadne obrázky"
-
-msgid "You have successfully uploaded {0} images to mapillary.com"
-msgstr "Úspešne ste odoslali {0} obrázkov na mapillary.com"
-
-msgid "Finished upload"
-msgstr "Odoslanie ukončené"
-
-msgid "You are not logged in, please log in to Mapillary in the preferences"
-msgstr "Nie ste prihlásený, prosím prihláste sa do Mapillary v nastaveniach"
-
-msgid "Not Logged in to Mapillary"
-msgstr "Neprihlásený do Mapillary"
-
-msgid "Uploading: {0}"
-msgstr "Odosiela sa: {0}"
-
 msgid "NanoLog"
 msgstr "NanoLog"
 
@@ -31069,6 +30606,112 @@ 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 ""
+"Tento nástroj vie nahradiť iba bod, zmeniť bod na cestu alebo multipolygón "
+"alebo nahradiť cestu inou cestou."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "Bod patrí ceste(ám), nemôže byť nahradený."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr "Relácia nie je multipolygón, nemôže byť použitý ako náhrada."
+
+msgid "Replace geometry for node {0}"
+msgstr "Nahradiť geometriu pre bod {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Prosím, vyberte jednu cestu, ktorá existuje v databáze a jednu novú cestu so "
+"správnou geometriou."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "Cesty musia byť kompletne v stiahnutej oblasti."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"Cesta, ktorá má byť nahradená, nemôže obsahovať žiadne body s vlastnosťou "
+"členstva v relácii, pokiaľ nepatria obom cestám."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"Prekročený limit iterácií pre robustnú metódu. Použije sa jednoduchšia "
+"metóda."
+
+msgid "Replace geometry for way {0}"
+msgstr "Nahradiť geometriu pre cestu {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Je pridaných príliš veľa ciest: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -31102,9 +30745,30 @@ msgstr "Značky budov:"
 msgid "Cannot place building outside of the world."
 msgstr "Nemožno umiestniť budovy mimo Zeme."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Vytvoriť 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 "Nastaviť veľkosť budovy"
 
@@ -31117,8 +30781,17 @@ msgstr "Automaticky vybrať budovu"
 msgid "Use address nodes under buildings"
 msgstr "Použiť adresové body pod budovami"
 
-msgid "Buildings width:"
-msgstr "Šírka budovy:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Dĺžka kroku:"
@@ -31849,6 +31522,18 @@ msgstr "Zmazať vybranú schému zo zoznamu."
 msgid "Color Schemes"
 msgstr "Farebná schéma"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Prerušte úpravy a zatvorte dialógové okno"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Použite úpravy a zatvorte dialógové okno"
+
 msgid "Conflation"
 msgstr ""
 
@@ -32343,6 +32028,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr "Prihlásiť sa"
+
 msgid "Enable autologin"
 msgstr "Povoliť automatické prihlásenie"
 
@@ -32376,24 +32064,15 @@ msgstr ""
 msgid "Close tab"
 msgstr ""
 
+msgid "Logout"
+msgstr "Odhlásiť sa"
+
 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 "Iba poloha"
 
@@ -32484,6 +32163,9 @@ msgstr "Globalsat Import"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importovať Dáta z Globalsat Datalogger DG100 do GPX vrstvy."
 
+msgid "Import"
+msgstr "Importovať"
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -33193,7 +32875,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"
@@ -33226,31 +32926,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"
@@ -34344,6 +34105,27 @@ msgstr "Neznámy typ súboru: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Rozloženie súboru \"{0}\" neúspešné"
 
+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"
 
@@ -34678,6 +34460,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr "Nie je vybratý žiadny obrázok"
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -35423,6 +35208,9 @@ msgstr ""
 msgid "State"
 msgstr "Štát (vo federácii)"
 
+msgid "pending"
+msgstr "čakajúca"
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -35843,12 +35631,6 @@ msgstr "Nová hodnota pre {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr "Neúspešné nadviazanie spojenia do 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>"
@@ -36187,12 +35969,6 @@ msgstr "JOSM Tag Editor Plugin (plugin pre úpravu značiek)"
 msgid "Presets"
 msgstr "Predvoľby"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Prerušte úpravy a zatvorte dialógové okno"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Použite úpravy a zatvorte dialógové okno"
-
 msgid "Highlight"
 msgstr "Zvýrazniť"
 
@@ -37858,47 +37634,6 @@ msgstr ""
 "Tento nástroj nahradí geometriu jedného objektu iným a vyžaduje preto, aby "
 "boli vybrané iba 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 vie nahradiť iba bod, zmeniť bod na cestu alebo multipolygón "
-"alebo nahradiť cestu inou cestou."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "Bod patrí ceste(ám), nemôže byť nahradený."
-
-msgid "Replace geometry for node {0}"
-msgstr "Nahradiť geometriu pre bod {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr "Relácia nie je multipolygón, nemôže byť použitý ako náhrada."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Prosím, vyberte jednu cestu, ktorá existuje v databáze a jednu novú cestu so "
-"správnou geometriou."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "Cesty musia byť kompletne v stiahnutej oblasti."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"Cesta, ktorá má byť nahradená, nemôže obsahovať žiadne body s vlastnosťou "
-"členstva v relácii, pokiaľ nepatria obom cestám."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"Prekročený limit iterácií pre robustnú metódu. Použije sa jednoduchšia "
-"metóda."
-
-msgid "Replace geometry for way {0}"
-msgstr "Nahradiť geometriu pre cestu {0}"
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -37975,9 +37710,6 @@ msgstr "Vybrať stredné body"
 msgid "Please select two nodes connected by way!"
 msgstr "Prosím, vyberte dva body spojené cestou!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Je pridaných príliš veľa ciest: {0}!"
-
 msgid "All inside [testing]"
 msgstr "Všetko vo vnútri [v testovaní]"
 
@@ -38224,27 +37956,28 @@ msgid "Search after waypoint. Click and move the map view to the waypoint."
 msgstr "Hľadať za waypointom. Kliknite a posuňte náhľad mapy k waypointu."
 
 msgid "Fetch Wikidata IDs"
-msgstr ""
+msgstr "Stiahnuť ID z Wikidata"
 
 msgid "Fetch Wikidata IDs using the ''wikipedia'' tag"
-msgstr ""
+msgstr "Stiahnuť ID z Wikidata pomocou značky \"wikipedia\""
 
 msgid "Fetching Wikidata IDs"
-msgstr ""
+msgstr "Sťahujú sa ID z Wikidata"
 
 msgid "Add Wikidata"
-msgstr ""
+msgstr "Pridať Wikidata"
 
 msgid "No Wikidata ID found for: {0}"
-msgstr ""
+msgstr "Nenašlo sa ID z Wikidata pre: {0}"
 
 msgid "Fetching {0} Wikidata ID for language ''{1}''"
 msgid_plural "Fetching {0} Wikidata IDs for language ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Sťahuje sa {0} ID z Wikidata pre jazyk \"{1}\""
+msgstr[1] "Sťahuje sa {0} ID z Wikidata pre jazyk \"{1}\""
+msgstr[2] "Sťahuje sa {0} ID z Wikidata pre jazyk \"{1}\""
 
 msgid "Add Wikidata for language ''{0}''"
-msgstr ""
+msgstr "Pridať Wikidata pre jazyk \"{0}\""
 
 msgid "Add names from Wikipedia"
 msgstr "Pridať názvy z Wikipedie"
@@ -38265,40 +37998,41 @@ msgstr "Kopírovať šablónu {0}"
 
 msgid "Overwrite ''{0}'' tag {1} from {2} with new value ''{3}''?"
 msgid_plural "Overwrite ''{0}'' tags {1} from {2} with new value ''{3}''?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Prepísať značky \"{0}\" {1} z {2} novou hodnotou \"{3}\"?"
+msgstr[1] "Prepísať značku \"{0}\" {1} z {2} novou hodnotou \"{3}\"?"
+msgstr[2] "Prepísať značky \"{0}\" {1} z {2} novou hodnotou \"{3}\"?"
 
 msgid "Download from Sophox API"
-msgstr ""
+msgstr "Stiahnuť zo Sophox API"
 
 msgid ""
 "Find places of education at least 2km, and at most 3km from the center of "
 "the selection"
-msgstr ""
+msgstr "Nájsť miesta vzdelávania aspoň 2km ale najviac 3km od stredu výberu"
 
 msgid "Show/hide Sophox snippet list"
-msgstr ""
+msgstr "Zobraziť/skryť zoznam úryvkov pre Sophox"
 
 msgid "help"
-msgstr ""
+msgstr "pomocník"
 
 msgid "Server: "
-msgstr ""
+msgstr "Server: "
 
 msgid "Wikidata+OSM server"
-msgstr ""
+msgstr "Wikidata+OSM server"
 
 msgid "Search Wikidata items"
-msgstr ""
+msgstr "Hľadať položky Wikidata"
 
 msgid "Target key: "
-msgstr ""
+msgstr "Cieľový kľúč: "
 
 msgid "Search Wikipedia category"
-msgstr ""
+msgstr "Hľadať kategóriu Wikidata"
 
 msgid "Load category"
-msgstr ""
+msgstr "Načítať kategóriu"
 
 msgid "Fetch Wikipedia articles with coordinates"
 msgstr "Získať články Wikipedie so súradnicami"
@@ -38319,13 +38053,13 @@ msgid "Not linked yet"
 msgstr "Zatiaľ neprepojené"
 
 msgid "{0}: {1}"
-msgstr ""
+msgstr "{0}: {1}"
 
 msgid "Wikidata"
-msgstr ""
+msgstr "Wikidata"
 
 msgid "Fetches all coordinates from Wikidata in the current view"
-msgstr ""
+msgstr "Stiahne všetky súradnice z Wikidata v aktuálnom pohľade"
 
 msgid "Fetches all coordinates from Wikipedia in the current view"
 msgstr "Získa všetky súradnice z Wikipedie v aktuálnom zobrazení"
@@ -38415,7 +38149,7 @@ msgid "View Wikidata page"
 msgstr "Zobraziť stránku Wikidata"
 
 msgid "View Wikispecies page"
-msgstr ""
+msgstr "Zobraziť stránku Wikispecies (Wikidruhy)"
 
 msgid "View UNESCO sheet"
 msgstr "Zobraziť hárok UNESCO"
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index 788fb03..48286ff 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2015-11-07 17:38+0000\n"
 "Last-Translator: Joško Horvat <Unknown>\n"
 "Language-Team: Slovenian <sl at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
 "n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:01+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:02+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: sl\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -952,8 +952,8 @@ msgstr ""
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-msgid "Separate Layer"
-msgstr "Ločena plast"
+msgid "Download as new layer"
+msgstr "Prenesi v novo plast"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Izberi, če naj se podatki prenesejo v novo plast"
@@ -2257,12 +2257,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"
@@ -8281,9 +8281,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr "Prenesi v novo plast"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9751,6 +9748,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12799,9 +12799,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 ""
 
@@ -14498,6 +14495,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 ""
 
@@ -14507,10 +14508,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 ""
@@ -16338,10 +16335,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17827,6 +17820,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17848,6 +17844,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20501,6 +20500,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Svetilnik"
 
@@ -23572,6 +23577,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 ""
 
@@ -23653,7 +23685,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23668,7 +23700,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 ""
@@ -23676,21 +23708,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 ""
 
@@ -23829,13 +23883,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"
@@ -23868,14 +23922,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 ""
@@ -23941,7 +23995,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)"
@@ -24028,13 +24082,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)"
@@ -24202,34 +24256,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 ""
@@ -24237,7 +24290,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)"
@@ -24285,7 +24338,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24293,7 +24346,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 ""
@@ -24462,8 +24515,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 ""
@@ -24471,9 +24523,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 ""
@@ -24481,10 +24531,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"
@@ -24517,57 +24567,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 ""
@@ -24575,13 +24620,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 ""
@@ -24649,13 +24694,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 ""
@@ -24663,7 +24708,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24671,7 +24716,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24679,19 +24724,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 ""
@@ -24796,13 +24841,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 ""
@@ -24810,7 +24855,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)"
@@ -24904,13 +24949,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 ""
 
@@ -24998,6 +25036,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 ""
 
@@ -25006,6 +25058,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 ""
 
@@ -25013,13 +25089,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 ""
@@ -25033,7 +25109,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 ""
@@ -25041,29 +25117,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)"
@@ -25132,7 +25207,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"
@@ -25165,6 +25243,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 ""
 
@@ -25213,33 +25297,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 ""
@@ -25247,7 +25329,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)"
@@ -25293,25 +25375,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"
@@ -25335,7 +25417,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)"
@@ -25431,7 +25513,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 ""
@@ -25439,6 +25521,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 ""
 
@@ -25457,7 +25546,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)"
@@ -25519,7 +25608,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 ""
@@ -25527,13 +25616,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)"
@@ -25620,7 +25709,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 ""
@@ -25628,7 +25724,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"
@@ -25643,6 +25739,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26634,32 +26736,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"
@@ -26668,9 +26766,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 ""
 
@@ -26777,6 +26872,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 ""
 
@@ -26820,6 +26918,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."
@@ -26853,6 +26954,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26900,6 +27004,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 ""
 
@@ -27065,6 +27174,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 ""
@@ -27854,550 +27966,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 ""
 
@@ -29092,6 +28660,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 ""
 
@@ -29125,9 +28791,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 ""
 
@@ -29140,7 +28827,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:"
@@ -29819,6 +29515,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 ""
 
@@ -30313,6 +30021,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30345,22 +30056,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"
@@ -30450,6 +30152,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Uvozi podatke iz Globalsat Datalogger DG100 naprave v plast GPX."
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31139,7 +30844,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"
@@ -31172,31 +30895,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"
@@ -32279,6 +32063,27 @@ msgstr "Neznana končnica datoteke: {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 ""
 
@@ -32612,6 +32417,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33349,6 +33157,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33759,12 +33570,6 @@ msgstr "Nova vrednost za {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>"
@@ -34101,12 +33906,6 @@ msgstr ""
 msgid "Presets"
 msgstr "Prednastavitve"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35649,39 +35448,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 ""
 
@@ -35755,9 +35521,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/sq.po b/i18n/po/sq.po
index 3dc36c1..bfe6e2f 100644
--- a/i18n/po/sq.po
+++ b/i18n/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2011-11-04 19:43+0000\n"
 "Last-Translator: StefanPrifti <Unknown>\n"
 "Language-Team: FLOSS Kosova\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 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: \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/sr.po b/i18n/po/sr.po
index 6ecb7a3..3675a0f 100644
--- a/i18n/po/sr.po
+++ b/i18n/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2015-02-01 15:30+0000\n"
 "Last-Translator: Slobodan Simić <Unknown>\n"
 "Language-Team: Serbian <sr at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:00+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:00+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: sr\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -948,8 +948,8 @@ msgstr ""
 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 ""
@@ -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>"
@@ -9703,6 +9700,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12745,9 +12745,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 ""
 
@@ -14440,6 +14437,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 ""
 
@@ -14449,10 +14450,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 ""
@@ -16276,10 +16273,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17765,6 +17758,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17786,6 +17782,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20439,6 +20438,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23510,6 +23515,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 ""
 
@@ -23591,7 +23623,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23606,7 +23638,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 ""
@@ -23614,21 +23646,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 ""
 
@@ -23767,13 +23821,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"
@@ -23806,14 +23860,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 ""
@@ -23879,7 +23933,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)"
@@ -23966,13 +24020,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)"
@@ -24140,34 +24194,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 ""
@@ -24175,7 +24228,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)"
@@ -24223,7 +24276,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24231,7 +24284,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 ""
@@ -24400,8 +24453,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 ""
@@ -24409,9 +24461,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 ""
@@ -24419,10 +24469,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"
@@ -24455,57 +24505,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 ""
@@ -24513,13 +24558,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 ""
@@ -24587,13 +24632,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 ""
@@ -24601,7 +24646,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24609,7 +24654,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24617,19 +24662,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 ""
@@ -24734,13 +24779,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 ""
@@ -24748,7 +24793,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)"
@@ -24842,13 +24887,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 ""
 
@@ -24936,6 +24974,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 ""
 
@@ -24944,6 +24996,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 ""
 
@@ -24951,13 +25027,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 ""
@@ -24971,7 +25047,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 ""
@@ -24979,29 +25055,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)"
@@ -25070,7 +25145,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"
@@ -25103,6 +25181,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 ""
 
@@ -25151,33 +25235,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 ""
@@ -25185,7 +25267,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)"
@@ -25231,25 +25313,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"
@@ -25273,7 +25355,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)"
@@ -25369,7 +25451,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 ""
@@ -25377,6 +25459,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 ""
 
@@ -25395,7 +25484,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)"
@@ -25457,7 +25546,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 ""
@@ -25465,13 +25554,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)"
@@ -25558,7 +25647,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 ""
@@ -25566,7 +25662,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"
@@ -25581,6 +25677,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26572,32 +26674,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"
@@ -26606,9 +26704,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 ""
 
@@ -26715,6 +26810,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 ""
 
@@ -26758,6 +26856,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."
@@ -26791,6 +26892,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26838,6 +26942,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 ""
 
@@ -27003,6 +27112,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 ""
@@ -27792,550 +27904,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 ""
 
@@ -29030,6 +28598,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 ""
 
@@ -29063,9 +28729,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 ""
 
@@ -29078,7 +28765,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:"
@@ -29757,6 +29453,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 ""
 
@@ -30251,6 +29959,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30283,22 +29994,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"
@@ -30388,6 +30090,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31077,7 +30782,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"
@@ -31110,31 +30833,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"
@@ -32215,6 +31999,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 ""
 
@@ -32548,6 +32353,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33285,6 +33093,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33695,12 +33506,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>"
@@ -34037,12 +33842,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35583,39 +35382,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 ""
 
@@ -35689,9 +35455,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/sv.po b/i18n/po/sv.po
index 95e2b4f..fb28b21 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2017-12-28 07:48+0000\n"
 "Last-Translator: Nka Mapper <Unknown>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:02+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:03+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: sv\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1017,8 +1017,8 @@ msgstr "Ange URL att hämta:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Skriv in URL:en till datan du vill hämta"
 
-msgid "Separate Layer"
-msgstr "Skilda lager"
+msgid "Download as new layer"
+msgstr "Hämta som ett nytt lager"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Välj om datan ska hämtas som ett nytt lager"
@@ -2430,12 +2430,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"
@@ -8621,9 +8621,6 @@ msgstr "Värde för latitud i intervallet [-90,90] krävs"
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Värde för longitud i intervallet [-180,180] krävs"
 
-msgid "Download as new layer"
-msgstr "Hämta som ett nytt lager"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10134,6 +10131,9 @@ msgstr "Ingen data hittad i fil ''{0}''."
 msgid "Open OSM file"
 msgstr "Öppna OSM-fil"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -13258,9 +13258,6 @@ msgstr "Fjärrstyrning"
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr "Ladda ner objekt till nytt lager"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14992,6 +14989,10 @@ msgstr "Behåll plugin"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Klicka för att behålla insticksmodulen ''{0}''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Misslyckades med att uppdatera föråldrad insticksmodul \"{0}\"."
 
@@ -15001,10 +15002,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 ""
@@ -16894,10 +16891,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "stuga"
-
 msgid "Start date"
 msgstr "Startdatum"
 
@@ -18395,6 +18388,9 @@ msgstr "Biodiesel"
 msgid "Octane 80"
 msgstr "80 oktan"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "91 oktan"
 
@@ -18416,6 +18412,9 @@ msgstr "E10 (10% etanolblandning)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% etanolblandning)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (gasol)"
 
@@ -21071,6 +21070,12 @@ msgstr "Fontän"
 msgid "Water Well"
 msgstr "Brunn"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Fyrtorn"
 
@@ -24153,6 +24158,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 ""
 
@@ -24234,7 +24266,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -24249,7 +24281,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 ""
@@ -24257,21 +24289,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 ""
 
@@ -24410,13 +24464,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"
@@ -24449,14 +24503,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 ""
@@ -24522,7 +24576,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)"
@@ -24609,13 +24663,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)"
@@ -24783,34 +24837,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 ""
@@ -24818,7 +24871,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)"
@@ -24866,7 +24919,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24874,7 +24927,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 ""
@@ -25043,8 +25096,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 ""
@@ -25052,9 +25104,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 ""
@@ -25062,10 +25112,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"
@@ -25098,57 +25148,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 ""
@@ -25156,13 +25201,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 ""
@@ -25230,13 +25275,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 ""
@@ -25244,7 +25289,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -25252,7 +25297,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -25260,19 +25305,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 ""
@@ -25377,13 +25422,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 ""
@@ -25391,7 +25436,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)"
@@ -25485,13 +25530,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 ""
 
@@ -25579,6 +25617,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 ""
 
@@ -25587,6 +25639,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 ""
 
@@ -25594,13 +25670,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 ""
@@ -25614,7 +25690,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 ""
@@ -25622,29 +25698,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)"
@@ -25713,7 +25788,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"
@@ -25746,6 +25824,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 ""
 
@@ -25794,33 +25878,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 ""
@@ -25828,7 +25910,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)"
@@ -25874,25 +25956,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"
@@ -25916,7 +25998,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)"
@@ -26012,7 +26094,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 ""
@@ -26020,6 +26102,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 ""
 
@@ -26038,7 +26127,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)"
@@ -26100,7 +26189,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 ""
@@ -26108,13 +26197,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)"
@@ -26201,7 +26290,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 ""
@@ -26209,7 +26305,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"
@@ -26224,6 +26320,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -27217,43 +27319,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 "spänning skall anges i volt utan enhet/avgränsare/mellanslag"
 
-msgid "unusual {0} specification"
-msgstr ""
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr ""
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr ""
-
 msgid "{0} must be a numeric value"
 msgstr "{0} måste vara ett numeriskt värde"
 
 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 ""
 
@@ -27360,6 +27455,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 ""
 
@@ -27405,6 +27503,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."
@@ -27438,6 +27539,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -27485,6 +27589,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 ""
 
@@ -27653,6 +27762,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 ""
@@ -28449,550 +28561,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 "Importera bilder"
-
-msgid "Import local pictures"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer"
-msgstr "Importera bilder till Mapillary-lager"
-
-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 "Zooma till vald bild"
-
-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 "Exportera markerad sekvens"
-
-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 "Visar nästa bild i sekvensen"
-
-msgid "Previous picture"
-msgstr ""
-
-msgid "Shows the previous picture in the sequence"
-msgstr "Visar föregående bild i sekvensen"
-
-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 "Logga ut"
-
-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 "Importera"
-
-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 ""
 
@@ -29687,6 +29255,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 ""
 
@@ -29720,9 +29386,30 @@ msgstr ""
 msgid "Cannot place building outside of the world."
 msgstr ""
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Skapa byggnad"
 
+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 "Ange byggnadsstorlek"
 
@@ -29735,7 +29422,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:"
@@ -30423,6 +30119,18 @@ msgstr "Ta bort valt schema från listan."
 msgid "Color Schemes"
 msgstr "Färgscheman"
 
+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 ""
 
@@ -30917,6 +30625,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr "Zooma in för att se meddelanden"
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30949,24 +30660,15 @@ msgstr "Privat chatt"
 msgid "Close tab"
 msgstr "Stäng flik"
 
+msgid "Logout"
+msgstr "Logga ut"
+
 msgid "Clear log"
 msgstr "Rensa logg"
 
 msgid "Show users on map"
 msgstr "Visa användare på karta"
 
-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 "Enbart position"
 
@@ -31057,6 +30759,9 @@ msgstr "Globalsatimport"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importera data från en Globalsat Datalogger DG100 in i ett GPX-lager"
 
+msgid "Import"
+msgstr "Importera"
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31750,7 +31455,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"
@@ -31783,31 +31506,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"
@@ -32904,6 +32688,27 @@ msgstr "Okänt filformat: {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"
 
@@ -33239,6 +33044,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33976,6 +33784,9 @@ msgstr ""
 msgid "State"
 msgstr "Delstat"
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -34386,12 +34197,6 @@ msgstr "Nytt värde för {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-msgid "Failed to open connection to API {0}."
-msgstr "Misslyckades med att öppna uppkoppling till 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>"
@@ -34728,12 +34533,6 @@ msgstr ""
 msgid "Presets"
 msgstr "Snabbval"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr "Färgmarkera"
 
@@ -36278,39 +36077,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 ""
 
@@ -36385,9 +36151,6 @@ msgstr ""
 msgid "Please select two nodes connected by way!"
 msgstr ""
 
-msgid "Too many ways are added: {0}!"
-msgstr ""
-
 msgid "All inside [testing]"
 msgstr "Alla inom [test]"
 
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index 07cea9f..9a9aebd 100644
--- a/i18n/po/ta.po
+++ b/i18n/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2017-06-06 01:06+0000\n"
 "Last-Translator: Stephane <Unknown>\n"
 "Language-Team: Tamil <ta at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:03+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:03+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "X-Poedit-Country: INDIA\n"
 "Language: ta\n"
 "X-Poedit-Language: Tamil\n"
@@ -968,8 +968,8 @@ msgstr "இறக்க வேண்டிய முகவரியை குற
 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 ""
@@ -2278,12 +2278,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"
@@ -8283,9 +8283,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>"
@@ -9738,6 +9735,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12782,9 +12782,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 ""
 
@@ -14477,6 +14474,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 ""
 
@@ -14486,10 +14487,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 ""
@@ -16313,10 +16310,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17802,6 +17795,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17823,6 +17819,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20476,6 +20475,12 @@ msgstr ""
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr ""
 
@@ -23547,6 +23552,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 ""
 
@@ -23628,7 +23660,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23643,7 +23675,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 ""
@@ -23651,21 +23683,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 ""
 
@@ -23804,13 +23858,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"
@@ -23843,14 +23897,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 ""
@@ -23916,7 +23970,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)"
@@ -24003,13 +24057,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)"
@@ -24177,34 +24231,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 ""
@@ -24212,7 +24265,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)"
@@ -24260,7 +24313,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24268,7 +24321,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 ""
@@ -24437,8 +24490,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 ""
@@ -24446,9 +24498,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 ""
@@ -24456,10 +24506,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"
@@ -24492,57 +24542,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 ""
@@ -24550,13 +24595,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 ""
@@ -24624,13 +24669,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 ""
@@ -24638,7 +24683,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24646,7 +24691,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24654,19 +24699,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 ""
@@ -24771,13 +24816,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 ""
@@ -24785,7 +24830,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)"
@@ -24879,13 +24924,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 ""
 
@@ -24973,6 +25011,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 ""
 
@@ -24981,6 +25033,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 ""
 
@@ -24988,13 +25064,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 ""
@@ -25008,7 +25084,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 ""
@@ -25016,29 +25092,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)"
@@ -25107,7 +25182,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"
@@ -25140,6 +25218,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 ""
 
@@ -25188,33 +25272,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 ""
@@ -25222,7 +25304,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)"
@@ -25268,25 +25350,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"
@@ -25310,7 +25392,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)"
@@ -25406,7 +25488,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 ""
@@ -25414,6 +25496,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 ""
 
@@ -25432,7 +25521,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)"
@@ -25494,7 +25583,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 ""
@@ -25502,13 +25591,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)"
@@ -25595,7 +25684,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 ""
@@ -25603,7 +25699,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"
@@ -25618,6 +25714,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26609,32 +26711,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"
@@ -26643,9 +26741,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 ""
 
@@ -26752,6 +26847,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 ""
 
@@ -26795,6 +26893,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."
@@ -26828,6 +26929,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26875,6 +26979,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 ""
 
@@ -27040,6 +27149,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 ""
@@ -27829,550 +27941,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 ""
 
@@ -29067,6 +28635,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 ""
 
@@ -29100,9 +28766,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 ""
 
@@ -29115,7 +28802,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:"
@@ -29794,6 +29490,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 ""
 
@@ -30288,6 +29996,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30320,22 +30031,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"
@@ -30425,6 +30127,9 @@ msgstr ""
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr ""
 
+msgid "Import"
+msgstr ""
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31114,7 +30819,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"
@@ -31147,31 +30870,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"
@@ -32252,6 +32036,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 ""
 
@@ -32585,6 +32390,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33322,6 +33130,9 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33732,12 +33543,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>"
@@ -34074,12 +33879,6 @@ msgstr ""
 msgid "Presets"
 msgstr ""
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35620,39 +35419,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 ""
 
@@ -35726,9 +35492,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/te.po b/i18n/po/te.po
index 4d96e52..db4e050 100644
--- a/i18n/po/te.po
+++ b/i18n/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2011-05-13 08:50+0000\n"
 "Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
 "Language-Team: Telugu <te at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:03+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:04+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: te\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/th.po b/i18n/po/th.po
index 1a237bb..9e71983 100644
--- a/i18n/po/th.po
+++ b/i18n/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2009-03-23 02:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Thai <th at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:03+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:04+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: th\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/tr.po b/i18n/po/tr.po
index 3c39726..70f9482 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2017-02-06 01:25+0000\n"
 "Last-Translator: Ferhad Fidan <ferhad at f-blog.info>\n"
 "Language-Team: Türkçe <>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:04+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:05+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: \n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -968,8 +968,8 @@ msgstr "İndirilecek URL’yi girin:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Verinin indirileceği URL’yi girin:"
 
-msgid "Separate Layer"
-msgstr "Farklı Katman"
+msgid "Download as new layer"
+msgstr "Yeni tabaka olarak indir"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "{"
@@ -2291,12 +2291,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"
@@ -8312,9 +8312,6 @@ msgstr ""
 msgid "Value for longitude in range [-180,180] required."
 msgstr ""
 
-msgid "Download as new layer"
-msgstr "Yeni tabaka olarak indir"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -9771,6 +9768,9 @@ msgstr ""
 msgid "Open OSM file"
 msgstr ""
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12838,9 +12838,6 @@ msgstr "Uzak Kontrol"
 msgid "Settings for the remote control feature."
 msgstr ""
 
-msgid "Download objects to new layer"
-msgstr ""
-
 msgid "Confirm all Remote Control actions manually"
 msgstr ""
 
@@ -14536,6 +14533,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 ""
 
@@ -14545,10 +14546,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 ""
@@ -16379,10 +16376,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr ""
-
 msgid "Start date"
 msgstr ""
 
@@ -17868,6 +17861,9 @@ msgstr ""
 msgid "Octane 80"
 msgstr ""
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr ""
 
@@ -17889,6 +17885,9 @@ msgstr ""
 msgid "E85 (85% Ethanol mix)"
 msgstr ""
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr ""
 
@@ -20542,6 +20541,12 @@ msgstr "Kaynak"
 msgid "Water Well"
 msgstr ""
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "DenizFeneri"
 
@@ -23613,6 +23618,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 ""
 
@@ -23694,7 +23726,7 @@ msgstr ""
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23709,7 +23741,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 ""
@@ -23717,21 +23749,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 ""
 
@@ -23870,13 +23924,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"
@@ -23909,14 +23963,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 ""
@@ -23982,7 +24036,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)"
@@ -24069,13 +24123,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)"
@@ -24243,34 +24297,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 ""
@@ -24278,7 +24331,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)"
@@ -24326,7 +24379,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24334,7 +24387,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 ""
@@ -24503,8 +24556,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 ""
@@ -24512,9 +24564,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 ""
@@ -24522,10 +24572,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"
@@ -24558,57 +24608,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 ""
@@ -24616,13 +24661,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 ""
@@ -24690,13 +24735,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 ""
@@ -24704,7 +24749,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24712,7 +24757,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24720,19 +24765,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 ""
@@ -24837,13 +24882,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 ""
@@ -24851,7 +24896,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)"
@@ -24945,13 +24990,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 ""
 
@@ -25039,6 +25077,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 ""
 
@@ -25047,6 +25099,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 ""
 
@@ -25054,13 +25130,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 ""
@@ -25074,7 +25150,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 ""
@@ -25082,29 +25158,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)"
@@ -25173,7 +25248,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"
@@ -25206,6 +25284,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 ""
 
@@ -25254,33 +25338,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 ""
@@ -25288,7 +25370,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)"
@@ -25334,25 +25416,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"
@@ -25376,7 +25458,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)"
@@ -25472,7 +25554,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 ""
@@ -25480,6 +25562,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 ""
 
@@ -25498,7 +25587,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)"
@@ -25560,7 +25649,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 ""
@@ -25568,13 +25657,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)"
@@ -25661,7 +25750,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 ""
@@ -25669,7 +25765,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"
@@ -25684,6 +25780,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26675,32 +26777,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"
@@ -26709,9 +26807,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 ""
 
@@ -26818,6 +26913,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 ""
 
@@ -26861,6 +26959,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."
@@ -26894,6 +26995,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr ""
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26941,6 +27045,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 ""
 
@@ -27106,6 +27215,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 ""
@@ -27895,550 +28007,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 "İçeri Al"
-
-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 ""
 
@@ -29133,6 +28701,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 "Çok fazla hat eklendi: {0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -29166,9 +28832,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 ""
 
@@ -29181,7 +28868,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:"
@@ -29860,6 +29556,18 @@ msgstr "Seçili şemayı sil."
 msgid "Color Schemes"
 msgstr "Renk Şeması"
 
+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 ""
 
@@ -30354,6 +30062,9 @@ msgstr ""
 msgid "Zoom in to see messages"
 msgstr ""
 
+msgid "Login"
+msgstr ""
+
 msgid "Enable autologin"
 msgstr ""
 
@@ -30386,22 +30097,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"
@@ -30493,6 +30195,9 @@ msgstr "Globalsat İçeri AL"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Globalsat Datalogger DG100 ’dan veriyi GPX tabakasına al."
 
+msgid "Import"
+msgstr "İçeri Al"
+
 msgid "GPS Blams"
 msgstr ""
 
@@ -31182,7 +30887,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"
@@ -31215,31 +30938,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"
@@ -32330,6 +32114,27 @@ msgstr "Bilinmeyen Dosya Uzantısı: {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"
 
@@ -32665,6 +32470,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33402,6 +33210,9 @@ msgstr ""
 msgid "State"
 msgstr "İl"
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr ""
 
@@ -33812,12 +33623,6 @@ msgstr "{0} için yeni değer"
 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>"
@@ -34154,12 +33959,6 @@ msgstr ""
 msgid "Presets"
 msgstr "Ayarlanmış"
 
-msgid "Abort tag editing and close dialog"
-msgstr ""
-
-msgid "Apply edited tags and close dialog"
-msgstr ""
-
 msgid "Highlight"
 msgstr ""
 
@@ -35698,39 +35497,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 ""
 
@@ -35804,9 +35570,6 @@ msgstr "Orta noktaları seç"
 msgid "Please select two nodes connected by way!"
 msgstr "Birleşen hatlar üzerinden iki nokta seçiniz."
 
-msgid "Too many ways are added: {0}!"
-msgstr "Çok fazla hat eklendi: {0}!"
-
 msgid "All inside [testing]"
 msgstr ""
 
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index 061d0b5..1531c04 100644
--- a/i18n/po/ug.po
+++ b/i18n/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2012-07-14 16:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Uyghur <ug at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:04+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:05+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: \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/uk.po b/i18n/po/uk.po
index b1690cf..e12e767 100644
--- a/i18n/po/uk.po
+++ b/i18n/po/uk.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
-"PO-Revision-Date: 2017-12-28 17:48+0000\n"
-"Last-Translator: Don-vip <Unknown>\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-27 14:40+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
 "Language-Team: Ukrainian <uk at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:05+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:05+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: uk\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1047,8 +1047,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 "Позначте, якщо дані повинні бути завантажені у новий шар"
@@ -2495,17 +2495,17 @@ msgstr "Перетворити на шар GPX починаючи  з остан
 
 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 ""
-"Спростити цей зв’язок до одного gpx-треку рекурсивно, починаючи від першого "
-"члена (-ів), послідовно продовжуючи до останнього."
+"Перетворити рекурсивно цей зв''язок на gpx-трек, починаючи з першого члена, "
+"та закінчуючи останнім."
 
 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 ""
-"Спростити цей зв’язок до одного gpx-треку рекурсивно, починаючи від "
-"останнього члена (-ів), послідовно продовжуючи до першого."
+"Перетворити рекурсивно цей зв''язок на gpx-трек, починаючи з останнього "
+"члена, та закінчуючи першим."
 
 msgid "Selected Relations"
 msgstr "Виділені зв’язки"
@@ -9023,9 +9023,6 @@ msgstr "Значення широти має бути в межах [-90,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>"
@@ -10720,6 +10717,9 @@ msgstr "У файлі ''{0}'' дані не знайдені."
 msgid "Open OSM file"
 msgstr "Відкрити файл OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr "Файли сервера OSM стиснені XZ"
+
 msgid "Validation Error Files"
 msgstr "Файл помилок валідатора"
 
@@ -14091,9 +14091,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 "Підтверджувати всі дії Дистанційного керування вручну"
 
@@ -16018,6 +16015,11 @@ 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}''."
 
@@ -16029,11 +16031,6 @@ msgstr ""
 "JOSM все ще використовуватиме попередню версію втулка."
 
 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 ""
@@ -18064,10 +18061,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr "на даху"
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "будка"
-
 msgid "Start date"
 msgstr "Початок роботи"
 
@@ -19576,6 +19569,9 @@ msgstr "Біодизель"
 msgid "Octane 80"
 msgstr "бензин (80)"
 
+msgid "Octane 87"
+msgstr "бензин (87)"
+
 msgid "Octane 91"
 msgstr "бензин (91)"
 
@@ -19597,6 +19593,9 @@ msgstr "E10 (10% суміш етанолу)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% суміш етанолу)"
 
+msgid "Ethanol (alcohol)"
+msgstr "етанол (спирт)"
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "пропан-бутан"
 
@@ -22252,6 +22251,12 @@ msgstr "Фонтан"
 msgid "Water Well"
 msgstr "Колодязь"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Маяк"
 
@@ -25360,6 +25365,36 @@ msgstr "OpenSnowMap"
 msgid "Overlay imagery for piste mapping in OSM. Updated daily."
 msgstr "Шар для нанесення лижних трас в OSM. Оновлюється щотижня."
 
+msgid "OpenRailwayMap"
+msgstr "OpenRailwayMap"
+
+msgid "Overlay imagery for railway mapping in OSM"
+msgstr "Шар для мапінгу залізничних колій в OSM"
+
+msgid "OpenInfraMap Telecoms"
+msgstr "OpenInfraMap Телекомунікації"
+
+msgid ""
+"Overlay imagery for telecoms infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Шар для мапінгу телекомунікаційної інфраструктури в OSM. Оновлюється щоденно."
+
+msgid "OpenInfraMap Power"
+msgstr "OpenInfraMap Електроенергетика"
+
+msgid ""
+"Overlay imagery for power infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Шар для мапінгу телекомунікаційної інфраструктури в OSM. Оновлюється щоденно."
+
+msgid "OpenInfraMap Petroleum"
+msgstr "OpenInfraMap Нафтогаз"
+
+msgid ""
+"Overlay imagery for petroleum infrastructure mapping in OSM. Updated daily."
+msgstr ""
+"Шар для мапінгу нафтогазової інфраструктури в OSM. Оновлюється щоденно."
+
 msgid "skobbler"
 msgstr "skobbler"
 
@@ -25441,8 +25476,8 @@ msgstr "OSM Inspector: Адреси"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM Inspector: береговая лінія (ЄС)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr "imagico.de - знімки OSM для мапінгу: гірський масив Проклетіе"
+msgid "imagico.de: Prokletije Mountains"
+msgstr "imagico.de: гірський масив Проклетіе"
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
@@ -25458,8 +25493,8 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr "Дороги та будівлі в Тирані, надаються гео-порталом Open Labs"
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
-msgstr "imagico.de - знімки OSM для мапінгу: Південні Трансантарктичні гори"
+msgid "imagico.de: Southern Transantarctic Mountains"
+msgstr "imagico.de: Південні Трансантарктичні гори"
 
 msgid ""
 "Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
@@ -25468,21 +25503,43 @@ msgstr ""
 "За межами звичайного покриття Landsat, тому відсутні в LIMA та Bing/Mapbox "
 "(true color)"
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
-msgstr "imagico.de - знімки OSM для мапінгу: гори Пенсакола"
+msgid "imagico.de: Pensacola Mountains"
+msgstr "imagico.de: гори Пенсакола"
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
-msgstr "imagico.de - знімки OSM для мапінгу: Острів слонів/Острів Кларенс"
+msgid "imagico.de: Elephant Island/Clarence Island"
+msgstr "imagico.de: Острів слонів/Острів Кларенс"
 
 msgid "Fairly clear up-to-date image for updating glacier edges (true color)"
 msgstr "Досить чітке актуальне зображення границь льодовика (true color)"
 
-msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
-msgstr "imagico.de - знімки OSM для мапінгу: Земля Ендбері та Берег Кемпа"
+msgid "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: Земля Ендбері та Берег Кемпа"
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr "Sentinel-2 - знімки Землі Ендербі та Берега Кемпа (true color)"
 
+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 топографічна мапа (TMS)"
 
@@ -25621,14 +25678,14 @@ msgstr "Міністерство агропромисловісті (WMS)"
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr "Міністерство енергетики та гірничодобувної промисловості (WMS)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
-msgstr "imagico.de - знімки OSM для мапінгу: Баїя-Бланка (час відливу)"
+msgid "imagico.de: Bahía Blanca (low tide)"
+msgstr "imagico.de: Баїя-Бланка (час відливу)"
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr "Приливні мілини та острови на узбережжі (true color)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
-msgstr "imagico.de - знімки OSM для мапінгу: Баїя-Бланка (час приливу)"
+msgid "imagico.de: Bahía Blanca (high tide)"
+msgstr "imagico.de: Баїя-Бланка (час приливу)"
 
 msgid "AGRI black-and-white 2.5m"
 msgstr "AGRI чорно-біла 2,5 м"
@@ -25660,8 +25717,8 @@ msgstr "LPI NSW Адміністративні границі державних
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW Адміністративні границі національних парків та заповідників"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
-msgstr "imagico.de - знімки OSM для мапінгу: Північний Захід острова Херд"
+msgid "imagico.de: Northwest Heard Island"
+msgstr "imagico.de: Північний Захід острова Херд"
 
 msgid ""
 "Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
@@ -25669,8 +25726,8 @@ msgstr ""
 "Льодовики на північному заході острова Херд (нещодавно замаплені) (ІЧ "
 "діапазон)"
 
-msgid "imagico.de OSM images for mapping: Heard Island coast"
-msgstr "imagico.de - знімки OSM для мапінгу: узбережжя острова Херд"
+msgid "imagico.de: Heard Island coast"
+msgstr "imagico.de: узбережжя острова Херд"
 
 msgid ""
 "Recent image of Heard island with interior mostly cloud covered but mostly "
@@ -25738,8 +25795,8 @@ msgstr "VoGIS: Плани"
 msgid "VoGIS: Höhen und Gelände"
 msgstr "VoGIS: висоти і рельєф місцевості"
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
-msgstr "imagico.de - знімки OSM для мапінгу: гори Ріла і Пірін"
+msgid "imagico.de: Rila and Pirin Mountains"
+msgstr "imagico.de: гори Ріла і Пірін"
 
 msgid "OpenStreetMap (Belgian Style)"
 msgstr "OpenStreetMap (Бельгійський стиль)"
@@ -25825,16 +25882,16 @@ msgstr "Автобусна зупинка TEC"
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "Бенін: Котону знімки з Плеяди 2016"
 
-msgid "imagico.de OSM images for mapping: Cotonou"
-msgstr "imagico.de - знімки OSM для мапінгу: Котону"
+msgid "imagico.de: Cotonou"
+msgstr "imagico.de: Котону"
 
 msgid "Patchy and partly cloudy coverage in usual sources (true color)"
 msgstr ""
 "Фрагментарне та частково закрите хмарами покриття зі звичайних джерел (true "
 "color)"
 
-msgid "imagico.de OSM images for mapping: Bouvet Island"
-msgstr "imagico.de - знімки OSM для мапінгу: острів Буве"
+msgid "imagico.de: Bouvet Island"
+msgstr "imagico.de: острів Буве"
 
 msgid "For more accurate coastline and glacier mapping (true color)"
 msgstr ""
@@ -26005,37 +26062,36 @@ msgstr "Високоякісні аерофотознімки міста Кел
 msgid "Kelowna Roads overlay"
 msgstr "Келоуна дороги, шар"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
-msgstr "imagico.de - знімки OSM для мапінгу: Східне узбережжя острова Девон"
+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"
-msgstr "imagico.de - знімки OSM для мапінгу: острів Північний Елсмір"
+msgid "imagico.de: Northern Ellesmere Island"
+msgstr "imagico.de: острів Північний Елсмір"
 
 msgid ""
 "Assembled from July 2012 ASTER imagery (true color with estimated blue)"
 msgstr ""
 "Збірка зі знімків ASTER червня 2012 (true color з відновленим блакитним)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
-msgstr "imagico.de - знімки OSM для мапінгу: Північний Елсмір липень 2016"
+msgid "imagico.de: Northern Ellesmere Island July 2016"
+msgstr "imagico.de: Північний Елсмір липень 2016"
 
 msgid ""
 "Assembled from July 2016 ASTER imagery (true color with estimated blue)"
 msgstr ""
 "Збірка зі знімків ASTER червня 2016 (true color з відновленим блакитним)"
 
-msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
-msgstr "imagico.de - знімки OSM для мапінгу: Фогу, Кабо-Верде"
+msgid "imagico.de: Fogo, Cape Verde"
+msgstr "imagico.de: Фогу, Кабо-Верде"
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr "Знімки після виверження 2014/2015  років (true color)"
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
-msgstr "imagico.de - знімки OSM для мапінгу: острів Лондондеррі"
+msgid "imagico.de: Isla Londonderry"
+msgstr "imagico.de: острів Лондондеррі"
 
 msgid ""
 "A lot of very coarse coastlines could be improved here, much snow cover "
@@ -26045,8 +26101,8 @@ msgstr ""
 "через велику кількість снігу не годиться для ля обкреслювання льодовиків (ІЧ "
 "діапазон)"
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
-msgstr "imagico.de - знімки OSM для мапінгу: вулкан Кальбуко"
+msgid "imagico.de: Volcán Calbuco"
+msgstr "imagico.de: вулкан Кальбуко"
 
 msgid "Image from after the 2015 eruption (true color)"
 msgstr "Знімки після виверження 2015  року (true color)"
@@ -26093,8 +26149,8 @@ msgstr "Стевнс"
 msgid "Vejmidte"
 msgstr "Централі частини міст"
 
-msgid "imagico.de OSM images for mapping: El Altar"
-msgstr "imagico.de - знімки OSM для мапінгу: вулкан Алтар"
+msgid "imagico.de: El Altar"
+msgstr "imagico.de: вулкан Алтар"
 
 msgid ""
 "2007 ASTER image offering better glacier coverage than common sources (true "
@@ -26103,9 +26159,8 @@ msgstr ""
 "Знімки ASTER 2007 забезпечують краще охоплення льодовиків, ніж звичайні "
 "джерела (true color з відновленим блакитним)"
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
-msgstr ""
-"imagico.de - знімки OSM для мапінгу: острови Дарвіна и Вулфа, Галапагоси"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
+msgstr "imagico.de: острови Дарвіна и Вулфа, Галапагоси"
 
 msgid ""
 "Recent image, only old and poor images in other sources currently (true "
@@ -26275,10 +26330,8 @@ 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 "
@@ -26287,12 +26340,9 @@ msgstr ""
 "Актуальні знімки узбережжя, зроблені під час відливу, для мапінгу приливних "
 "територій (true color)"
 
-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 "
@@ -26301,11 +26351,11 @@ msgstr ""
 "Актуальні знімки узбережжя, зроблені під час відливу, для мапінгу приливних "
 "територій (ІЧ діапазон)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr "imagico.de - знімки OSM для мапінгу: узбережжя Північного моря, 2016"
+msgid "imagico.de: North Sea Coast 2016"
+msgstr "imagico.de: узбережжя Північного моря, 2016"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
-msgstr "imagico.de - знімки OSM для мапінгу: узбережжя Північного моря 2017"
+msgid "imagico.de: North Sea Coast 2017"
+msgstr "imagico.de: узбережжя Північного моря 2017"
 
 msgid "Saxony latest aerial imagery"
 msgstr "Саксонія - свіжі знімки"
@@ -26337,20 +26387,20 @@ msgstr "Майнц - остані знімки"
 msgid "Munich latest aerial imagery 60cm"
 msgstr "Мюнхен: нові аерофотознімки 60 см"
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
-msgstr "imagico.de - знімки OSM для мапінгу: Касігіаннгуіт"
+msgid "imagico.de: Qasigiannguit"
+msgstr "imagico.de: Касігіаннгуіт"
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr "Icebridge DMS - знімки поселення (вирівнювання може бути неточним)"
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
-msgstr "imagico.de - знімки OSM для мапінгу: авіабаза Туле"
+msgid "imagico.de: Thule Air Base"
+msgstr "imagico.de: авіабаза Туле"
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr "Знімки Icebridge DMS (вирівнювання може бути неточним)"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
-msgstr "imagico.de - знімки OSM для мапінгу: Канґерлуссуак восени"
+msgid "imagico.de: Kangerlussuaq Autumn"
+msgstr "imagico.de: Канґерлуссуак восени"
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
@@ -26358,45 +26408,36 @@ msgstr ""
 "Icebridge DMS: знімки аеропорту та поселення - вирівнювання може бути не "
 "точним"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
-msgstr "imagico.de - знімки OSM для мапінгу: Канґерлуссуак весна"
+msgid "imagico.de: Kangerlussuaq Spring"
+msgstr "imagico.de: Канґерлуссуак весна"
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr ""
 "Icebridge DMS: знімки аеропорту та доріг - вирівнювання може бути не точним"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
-msgstr ""
-"imagico.de - знімки OSM для мапінгу: Авіабаза Туле DMS проліт на малих "
-"висотах вересень 2015"
+msgid "imagico.de: Thule Airbase DMS low altitude overflight September 2015"
+msgstr "imagico.de: Авіабаза Туле DMS проліт на малих висотах вересень 2015"
 
 msgid ""
 "Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
 msgstr ""
 "Icebridge DMS - аерознімки з авіабази Тулє (вирівнювання може бути неточним)"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
-"2015"
-msgstr ""
-"imagico.de - знімки OSM для мапінгу: Авіабаза Туле DMS проліт у вересені 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"
-msgstr ""
-"imagico.de - знімки OSM для мапінгу: Авіабаза Туле DMS проліт у жовтні 2015"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
+msgstr "imagico.de: Авіабаза Туле DMS проліт у жовтні 2015"
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
-msgstr "imagico.de - знімки OSM для мапінгу: Гренландія мозаїка"
+msgid "imagico.de: Greenland mosaic"
+msgstr "imagico.de: Гренландія мозаїка"
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr "Landsat - мозаїка Гренландії (true color)"
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
-msgstr "imagico.de - знімки OSM для мапінгу: травень 2013 Landsat від надіра"
+msgid "imagico.de: May 2013 off-nadir Landsat"
+msgstr "imagico.de: травень 2013 Landsat від надіра"
 
 msgid ""
 "First available image north of the regular Landsat limit, mostly with "
@@ -26406,14 +26447,14 @@ msgstr ""
 "звичайних знімків Landsat. Через велику кількість снігу з ними важко "
 "працювати"
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
-msgstr "imagico.de - знімки OSM для мапінгу: липень 2016 Landsat від надіра"
+msgid "imagico.de: Landsat off-nadir July 2016"
+msgstr "imagico.de: липень 2016 Landsat від надіра"
 
 msgid "Latest images north of the regular Landsat limit (true color)"
 msgstr "Останні знімки Landsat північніше звичайної межі (true color)"
 
-msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
-msgstr "imagico.de - знімки OSM для мапінгу: Північна Гренландія ASTER"
+msgid "imagico.de: Northern Greenland ASTER"
+msgstr "imagico.de: Північна Гренландія ASTER"
 
 msgid ""
 "Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
@@ -26482,22 +26523,22 @@ msgstr "OpenStreetMap Угорщина (піші туристичні маршр
 msgid "Hillshade Hungary"
 msgstr "Угорщина рель’єф"
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
-msgstr "imagico.de - знімки OSM для мапінгу: Східна Ісландія"
+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"
-msgstr "imagico.de - знімки OSM для мапінгу: Качский Ранн"
+msgid "imagico.de: Rann of Kutch"
+msgstr "imagico.de: Качский Ранн"
 
 msgid ""
 "Land/water distinction difficult to properly map based on Bing/Mapbox images "
 "(false color IR)"
 msgstr "Межа землі/води, яку важко розгледіти на знімках Bing/Mapbox"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
-msgstr "imagico.de - знімки OSM для мапінгу: Судірман 2015"
+msgid "imagico.de: Sudirman Range 2015"
+msgstr "imagico.de: Судірман 2015"
 
 msgid ""
 "Older image of the Sudirman Range with no fresh snow showing glacier extent "
@@ -26506,8 +26547,8 @@ msgstr ""
 "Старі знімки хребта Судірман без свіжого снігу, на яких видно межі льодовика "
 "(true color)"
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
-msgstr "imagico.de - знімки OSM для мапінгу: Південно-Східний Сулавесі"
+msgid "imagico.de: Southeastern Sulawesi"
+msgstr "imagico.de: Південно-Східний Сулавесі"
 
 msgid ""
 "Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
@@ -26516,20 +26557,20 @@ msgstr ""
 "Відсутні острівці та неточна лінія узбережжя, через хмарність на Bing, також "
 "для додавання додаткових елементів озерам (true color)"
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
-msgstr "imagico.de - знімки OSM для мапінгу: водосховище Бакун"
+msgid "imagico.de: Bakun Reservoir"
+msgstr "imagico.de: водосховище Бакун"
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr "Відсутнє на старих знімках до 2011 р (true color)"
 
-msgid "imagico.de OSM images for mapping: Batam"
-msgstr "imagico.de - знімки OSM для мапінгу: Батам"
+msgid "imagico.de: Batam"
+msgstr "imagico.de: Батам"
 
 msgid "Missing Islands in OSM (true color)"
 msgstr "Відсутні в OSM острови (true color)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
-msgstr "imagico.de - знімки OSM для мапінгу: Судірман 2016"
+msgid "imagico.de: Sudirman Range 2016"
+msgstr "imagico.de: Судірман 2016"
 
 msgid ""
 "Cloud free image of the Sudirman Range but with fresh snow (true color)"
@@ -26635,16 +26676,14 @@ msgstr "Японія: ортознімки GSI"
 msgid "Japan GSI Standard Map"
 msgstr "Японія: стандартна мапа GSI"
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
-msgstr ""
-"imagico.de - знімки OSM для мапінгу: Аральське море (низький рівень води)"
+msgid "imagico.de: Aral Sea (low water level)"
+msgstr "imagico.de: Аральське море (низький рівень води)"
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr "Межі води та заболочених земель, дамби та т.і. (true color)"
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
-msgstr ""
-"imagico.de - знімки OSM для мапінгу: Аральське море (високий рівень води)"
+msgid "imagico.de: Aral Sea (high water level)"
+msgstr "imagico.de: Аральське море (високий рівень води)"
 
 msgid ""
 "Water and wetland extents, dams etc. - some remaining winter ice in the "
@@ -26653,8 +26692,8 @@ msgstr ""
 "Межі води та заболочених земель, дамби та т.і. - на півночі місцями льод "
 "(true color)"
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
-msgstr "imagico.de - знімки OSM для мапінгу: гора Кенія, 2016"
+msgid "imagico.de: Mount Kenya 2016"
+msgstr "imagico.de: гора Кенія, 2016"
 
 msgid "Up-to-date image for glacier mapping (true color)"
 msgstr "Актуальні знімки для мапінгу льодовиків (true color)"
@@ -26760,15 +26799,6 @@ msgid ""
 msgstr ""
 "Офіційні норвезькі географічні назви з бази даних SSR. Вибір по категоріях."
 
-msgid "MTBmap.no"
-msgstr "MTBmap.no"
-
-msgid ""
-"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
-msgstr ""
-"Норвезька мапа маршрутів для  гірських велосипедів від OSM (максимальний "
-"масштаб 14-16, залежить від регіону)"
-
 msgid "Kartverket DTM Digital Terrain Model"
 msgstr "Kartverket DTM (цифрова модель рельєфу)"
 
@@ -26881,6 +26911,21 @@ msgid ""
 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 "Miljødirektoratet - шар природоохоронних зон"
 
@@ -26891,6 +26936,36 @@ msgstr ""
 "Норвезькі національні парки, заповідники та інші природоохоронні території "
 "та об’єкти з Naturbase, включаючи Свальбард/Шпіцберген"
 
+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 "SSB Urban Areas"
+
+msgid ""
+"Human settlements of at least 200 people with less than 200 meters between "
+"households"
+msgstr ""
+"Населені пункти з не менш як 200 мешканців, та відстанню між будинками менше "
+"ніж 200 метрів"
+
+msgid "MTBmap.no"
+msgstr "MTBmap.no"
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+"Норвезька мапа маршрутів для  гірських велосипедів від OSM (максимальний "
+"масштаб 14-16, залежить від регіону)"
+
 msgid "NP Svalbard Orthophoto"
 msgstr "NP - Свальбард/Шпіцберген ортофото"
 
@@ -26898,14 +26973,14 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr "Ортофото  Свальбарда/Шпіцбергена від Норвезького Полярного Інституту"
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
-msgstr "imagico.de - знімки OSM для мапінгу: мозаїка Шпіцбергену"
+msgid "imagico.de: Svalbard mosaic"
+msgstr "imagico.de: мозаїка Шпіцбергену"
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr "Sentinel-2 - мозаїка Шпіцбергену (true color)"
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
-msgstr "imagico.de - знімки OSM для мапінгу: Західний Каракорум"
+msgid "imagico.de: Western Karakoram"
+msgstr "imagico.de: Західний Каракорум"
 
 msgid ""
 "Represents approximately minimum snow cover so can be well used for glacier "
@@ -26919,9 +26994,8 @@ msgstr "Сектор Газа - Pléiades - 06.07.2014"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Сектор Газа - Pléiades - 06.07.2014 (NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
-msgstr ""
-"imagico.de - знімки OSM для мапінгу: Панамський канал – Тихоокеанська частина"
+msgid "imagico.de: Panama Canal - Pacific side"
+msgstr "imagico.de: Панамський канал – Тихоокеанська частина"
 
 msgid ""
 "New locks with less clouds than in the Sentinel-2 image - make sure to check "
@@ -26930,33 +27004,30 @@ msgstr ""
 "Нові шлюзи з меншою кількістю хмар, ніж на знімках Sentinel-2 - перевірте "
 "привʼязку знімків (true color)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
-msgstr "imagico.de - знімки OSM для мапінгу: Панамський канал"
+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"
-msgstr "imagico.de - знімки OSM для мапінгу: Ванатінаі"
+msgid "imagico.de: Vanatinai"
+msgstr "imagico.de: Ванатінаі"
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr ""
 "Приблизна лінія узбережжя через захмареність Bing/Mapbox (true color)"
 
-msgid "imagico.de OSM images for mapping: New Ireland"
-msgstr "imagico.de - знімки OSM для мапінгу: Нова Ірландія"
+msgid "imagico.de: New Ireland"
+msgstr "imagico.de: Нова Ірландія"
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr "Багато відсутніх в OSM островів (знятті останнім часом) (true color)"
 
-msgid "imagico.de OSM images for mapping: Coropuna"
-msgstr "imagico.de - знімки OSM для мапінгу: Коропуна"
+msgid "imagico.de: Coropuna"
+msgstr "imagico.de: Коропуна"
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
-msgstr ""
-"imagico.de - знімки OSM для мапінгу: гори Вільканота та Крижана шапка "
-"Куелччая"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr "imagico.de: гори Вільканота та Крижана шапка Куелччая"
 
 msgid "Poor and outdated imagery in other sources (true color)"
 msgstr "Низькоякісні чи застаріли знімки в інших джерелах (true color)"
@@ -26977,7 +27048,7 @@ msgid "Geoportal 2: ISOK hillshade"
 msgstr "Geoportal 2: ISOK рельєф"
 
 msgid "polska.e-mapa.net: Buildings"
-msgstr ""
+msgstr "polska.e-mapa.net: будинки"
 
 msgid "Będzin: Orthophotomap 2013 (aerial image)"
 msgstr "Бендзин:  Ортофотомапа 2013 (супутникові знімки)"
@@ -27024,8 +27095,11 @@ msgstr "Катовіце: Будинки"
 msgid "Łódź: Buildings"
 msgstr "Човен: Будинки"
 
-msgid "Łódź: Orthophotomap (aerial image)"
-msgstr "Лодзь: Ортофотомапа (супутникові знімки)"
+msgid "Łódź: Orthophotomap 2015 (aerial image)"
+msgstr "Лодзь: ортофото 2015 (супутникові знімки)"
+
+msgid "Łódź: Orthophotomap 2017 (aerial image)"
+msgstr "Лодзь: отофото 2017 (супутникові знімки)"
 
 msgid "Powiat dębicki: Buildings"
 msgstr "Дембицький повіт: Будинки"
@@ -27057,6 +27131,12 @@ msgstr "Стальововольський повіт: Будинки"
 msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr "Познань:  Ортофотомапа 2014 (супутникові знімки)"
 
+msgid "Poznań: Orthophotomap 2016 (aerial image)"
+msgstr "Познань: отофото 2016 (супутникові знімки)"
+
+msgid "Poznań: Buildings"
+msgstr "Познань: будинки"
+
 msgid "Przemyśl: Buildings"
 msgstr "Перемишль: Будинки"
 
@@ -27105,36 +27185,32 @@ msgstr "ScanEx IRS"
 msgid "ScanEx SPOT"
 msgstr "ScanEx SPOT"
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
-msgstr "imagico.de - знімки OSM для мапінгу: Керченська протока"
+msgid "imagico.de: Kerch Strait"
+msgstr "imagico.de: Керченська протока"
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr "Стан будівництва мосту в серпні 2016 (true color)"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr "imagico.de - знімки OSM для мапінгу: узбережжя Печорського моря"
+msgid "imagico.de: Pechora Sea Coast"
+msgstr "imagico.de: узбережжя Печорського моря"
 
 msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
 msgstr "Знімки Sentinel-2 берега Печорського моря восени 2016 (true color)"
 
-msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
-msgstr "imagico.de - знімки OSM для мапінгу: Острів Ушакова серпень 2016"
+msgid "imagico.de: Ushakov Island August 2016"
+msgstr "imagico.de: Острів Ушакова серпень 2016"
 
 msgid "Up-to-date late summer imagery with few clouds (true color)"
 msgstr "Актуальні знімки кінця літа з невеличкою хмарністю (true color)"
 
-msgid "imagico.de OSM images for mapping: Northern Dvina delta at low tide"
-msgstr ""
-"imagico.de - знімки OSM для мапінгу: дельта Північної Двіни під час відливу"
+msgid "imagico.de: Northern Dvina delta at low tide"
+msgstr "imagico.de: дельта Північної Двіни під час відливу"
 
 msgid "Beaches, tidal flats and other costal forms (true color)"
 msgstr "Пляжі, приливні мілини та інші берегові структури (true color)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern and Polar Ural mountains August "
-"2016"
-msgstr ""
-"imagico.de - знімки OSM для мапінгу: Північний і Полярний Урал серпень 2016"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
+msgstr "imagico.de: Північний і Полярний Урал серпень 2016"
 
 msgid ""
 "Up-to-date late summer imagery with few clouds - caution: not all visible "
@@ -27143,8 +27219,8 @@ msgstr ""
 "Актуальні знімки кінця літа з невеличкою хмарністю (true color) - увага: не "
 "весь сніг є льодовиками (true color)"
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
-msgstr "imagico.de - знімки OSM для мапінгу: космодром Східний (Восточний)"
+msgid "imagico.de: Vostochny Cosmodrome"
+msgstr "imagico.de: космодром Східний (Восточний)"
 
 msgid "Recent image showing newest features (true color)"
 msgstr "Останні знімки із самими останніми змінами"
@@ -27193,27 +27269,27 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "Південна Африка CD:NGI Aerial"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
-msgstr "imagico.de - знімки OSM для мапінгу: острів Лєскова ASTER"
+msgid "imagico.de: Leskov Island ASTER"
+msgstr "imagico.de: острів Лєскова ASTER"
 
 msgid "Missing in other image sources (true color with estimated blue)"
 msgstr ""
 "Відсутні в інших джерелах знімків дані (true color з відновленим блакитним)"
 
-msgid "imagico.de OSM images for mapping: Scott Island"
-msgstr "imagico.de - знімки OSM для мапінгу: острів Скотта"
+msgid "imagico.de: Scott Island"
+msgstr "imagico.de: острів Скотта"
 
 msgid "Missing in other image sources (true color)"
 msgstr "Відсутні в інших джерелах знімків дані (true color)"
 
-msgid "imagico.de OSM images for mapping: Leskov Island Landsat"
-msgstr "imagico.de - знімки OSM для мапінгу: острів Лєскова Landsat"
+msgid "imagico.de: Leskov Island Landsat"
+msgstr "imagico.de: острів Лєскова Landsat"
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
-msgstr "imagico.de - знімки OSM для мапінгу: скелі Клерк"
+msgid "imagico.de: Clerke Rocks"
+msgstr "imagico.de: скелі Клерк"
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
-msgstr "imagico.de - знімки OSM для мапінгу: скелі Шаг"
+msgid "imagico.de: Shag Rocks"
+msgstr "imagico.de: скелі Шаг"
 
 msgid "Catastro Spain"
 msgstr "Кадастрова мапа Іспанії"
@@ -27236,8 +27312,8 @@ msgstr "IDEIB - Балеарські острови"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Канарські острови"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
-msgstr "imagico.de - знімки OSM для мапінгу: Адамів міст"
+msgid "imagico.de: Adams Bridge"
+msgstr "imagico.de: Адамів міст"
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr "Доповнюють неповне покриття з інших джерел (true color)"
@@ -27332,9 +27408,8 @@ msgstr "Кантон Базель-Штадт 2017"
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr "Кантон Базель - ландшафт 10см (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 для мапінгу: Центральні Альпи, кінець вересня 2016"
 
 msgid ""
 "Up-to-date image for glacier mapping - beware of some fresh snow at higher "
@@ -27343,6 +27418,13 @@ msgstr ""
 "Актуальні знімки для мапінгу льодовиків (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 "Тайвань e-Map Open Data"
 
@@ -27363,8 +27445,8 @@ msgstr "Тайвань Земельний поділ"
 msgid "NLSC Open Data WMTS"
 msgstr "NLSC Open Data WMTS"
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
-msgstr "imagico.de - знімки OSM для мапінгу: гора Кіліманджаро 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
+msgstr "imagico.de: гора Кіліманджаро 2016"
 
 msgid "Aşgabat (high resolution)"
 msgstr "Ашгабат (висока розподільча здатність)"
@@ -27434,8 +27516,8 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "Дороги лісової служби США"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
-msgstr "imagico.de - знімки OSM для мапінгу: діапазон Аляски"
+msgid "imagico.de: Alaska Range"
+msgstr "imagico.de: діапазон Аляски"
 
 msgid ""
 "Recent summer image of the Alaska Range for mapping natural features (true "
@@ -27444,14 +27526,14 @@ msgstr ""
 "Недавні літні знімки Аляскінського хребта для картографування природних "
 "об’єктів (true color)"
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
-msgstr "imagico.de - знімки OSM для мапінгу: Богословський острів"
+msgid "imagico.de: Bogoslof Island"
+msgstr "imagico.de: Богословський острів"
 
 msgid "Recent image from after the eruption (true color)"
 msgstr "Знімки відразу після виверження (true color)"
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
-msgstr "imagico.de - знімки OSM для мапінгу: Затока Кука"
+msgid "imagico.de: Cook Inlet"
+msgstr "imagico.de: Затока Кука"
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
 msgstr "Приливні мілини та льодовики в горах навколо (true color)"
@@ -27550,8 +27632,16 @@ msgstr ""
 "природних кольорах та ближньому ІЧ-діапазоні (4 діапазони - R, G, B, IR), що "
 "охоплюють округи Нью-Касл, Кент і Сассекс штату Делавер."
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
-msgstr "imagico.de - знімки OSM для мапінгу: гори Рувензори"
+msgid "NYS Orthos Online"
+msgstr "Ортофото штат Нью-Йорк"
+
+msgid ""
+"New York State High Resolution Digital Orthoimagery, 1 foot resolution"
+msgstr ""
+"Цифрові ортоснімкі штату Нью-Йорк у високій роздільній здатності (1 фут)"
+
+msgid "imagico.de: Rwenzori Mountains"
+msgstr "imagico.de: гори Рувензори"
 
 msgid ""
 "Recent image of most of the remaining Rwenzori Mountains glaciers (false "
@@ -27559,8 +27649,8 @@ msgid ""
 msgstr ""
 "Недавні знімки більшості наявних льодовиків гір Рувензори (ІЧ-діапазон)"
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
-msgstr "imagico.de - знімки OSM для мапінгу: гори Рувензори 2016"
+msgid "imagico.de: Rwenzori Mountains 2016"
+msgstr "imagico.de: гори Рувензори 2016"
 
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "Україна - ортофотоплани 2012"
@@ -27574,6 +27664,12 @@ msgstr "Україна - Київ 2014 (ДЗК)"
 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 історична"
 
@@ -28722,51 +28818,46 @@ msgstr "{0} повинно бути цілим числом між -5 та 5"
 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 ""
+"неочікуване значення {0}: використовуйте \".\"(крапку) замість \",\" (коми) "
+"як десятковий розділювач"
+
 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}: типово в метрах; десятковий розділювач — крапка; одиниці виміру "
-"вказуються через пробіл"
+"неочікуване значення {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}: типово в тоннах; роздільник – крапка; якщо треба, одиниці виміру "
-"відділяються пробілом"
+"неочікуване значення {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}: типово в кілометрах; роздільник – крапка; якщо треба, одиниці виміру "
-"відділяються пробілом"
+"неочікуване значення {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 "{0} повинне бути числом в метрах, без зазначення одиниць виміру"
 
@@ -28888,6 +28979,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 "Показувати назви вулиць (на великих масштабах)"
 
@@ -28946,6 +29040,9 @@ msgstr ""
 "Автоматично присвоює адреси виділеним обʼєктам в Австрії. Дані: © "
 "Ö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."
@@ -28994,6 +29091,9 @@ msgstr ""
 "Перейдіть за посилання, щоб ознайомитись із стандартними командами (arc, "
 "circle тощо)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr "Інструмент для обʼєднання даних (пошук збігів та їх поєднання)"
 
@@ -29050,6 +29150,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"
 
@@ -29266,6 +29371,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 ""
@@ -30148,577 +30256,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 "{0} послідовностей, кожна містить від {1} до {2} знімків (ø {3})"
-
-msgid "{0} imported images"
-msgstr "{0} імпортованих знімків"
-
-msgid "{0} downloaded images"
-msgstr "{0} завантежених знімків"
-
-msgid "{0} images in total"
-msgstr "{0} знімків всього"
-
-msgid "{0} images in {1} sequences"
-msgstr "{0} знімків в {1} послідовностях"
-
-msgid "Mapillary object layer"
-msgstr "Шар обʼєктів Mapillary"
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr "Показує шар з обʼєктами, що були виявлені Mapillary"
-
-msgid "Open Mapillary layer"
-msgstr "Відкрити шар Mapillary"
-
-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 "{0} знімків надіслано, ключ набору змін: {1}, стан: {2}"
-
-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 "Надіслати знімки Mapillary"
-
-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 "Натисніть \"{0}\" для завантаження зображень"
-
-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 "Зупиняє перегляд."
-
-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 ""
-"Під час відкривання знімка Mapillary у веб-оглядачі, показувати редактор "
-"розмивання замість перегляду знімка"
-
-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 "Які шари зображень ви бажаєте імпортувати до шару Mapillary?"
-
-msgid "Import"
-msgstr "Імпортувати"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr "Неможливо імпортувати геотеговані знімки до шару Mapillary’!"
-
-msgid "{0} ({1} images)"
-msgstr "{0} ({1} знімків)"
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr "З яких джерел ви бажаєте імпортувати зображення до шару Mapillary?"
-
-msgid "There are currently no layers with geotagged images!"
-msgstr "Шар зображень з геопривʼязкою відсутній!"
-
-msgid "Images from my file system"
-msgstr "Зображення з моєї файлової системи"
-
-msgid "Select the images you want to import"
-msgstr "Оберіть зображення для імпорту"
-
-msgid "All images in a directory"
-msgstr "Всі зображення у теці"
-
-msgid "Select directory to import images from"
-msgstr "Оберіть теку для імпорту зображень з неї"
-
-msgid "From existing image layer"
-msgstr "З поточного шару зображень"
-
-msgid "Import exception"
-msgstr "Обмеження імпорту"
-
-msgid "Could not import the image ''{0}''!"
-msgstr "Неможливо імпортувати зображення ''{0}''!"
-
-msgid "Could not import the directory ''{0}''!"
-msgstr "Неможливо імпортувати теку ''{0}''!"
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr "Теґ з ключем <i>{0}</i> вже присутній у виділеного обʼєкта OSM."
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr ""
-"Ви дійсно бажаєете замінити поточне значення <i>{0}</i> на нове  <i>{1}</i>?"
-
-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 ""
-"Втулок Mapillary тепер використовує окрему панель для показу додаткової "
-"інформації (наприклад, ключа зображення) і дії для поточного зображення "
-"Mapillary (наприклад, перегляд в оглядачі)."
-
-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 "Показує докладну інформацію про поточний знімок Mapillary"
-
-msgid "Show detections on top of image"
-msgstr "Показувати виявлені образи поверх зображення"
-
-msgid "View in browser"
-msgstr "Подивитись в оглядачі"
-
-msgid "Copy key"
-msgstr "Копіювати ключ"
-
-msgid "Add Mapillary tag"
-msgstr "Додати теґ Mapillary"
-
-msgid "Image detections"
-msgstr "Розпізнавання образів"
-
-msgid "Image actions"
-msgstr "Дії над знімком"
-
-msgid "Image key"
-msgstr "Ключ знімка"
-
-msgid "Sequence key"
-msgstr "Ключ послідовності"
-
-msgid "{0} detections"
-msgstr "{0} образів"
-
-msgid "image has no key"
-msgstr "знімок не має ключа"
-
-msgid "unknown user"
-msgstr "невідомий користувач"
-
-msgid "sequence has no key"
-msgstr "послідовність не має ключа"
-
-msgid "Could not open the URL {0} in a browser"
-msgstr "Не можливо відкрити URL {0} в оглядачі"
-
-msgid "Downloading map objects…"
-msgstr "Завантаження обʼєктів мапи…"
-
-msgid "All map objects loaded."
-msgstr "Всі обʼєкти мапи завантажено."
-
-msgid "Too many map objects, zoom in to see all."
-msgstr "Забагато обʼєктів, треба наблизитись, щоб побачити їх всі."
-
-msgid "Downloading map objects failed!"
-msgstr "Збій завантаження обʼєктів мапи!"
-
-msgid "Mapillary objects"
-msgstr "Обʼєкти Mapillary"
-
-msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr "Показує обʼєкти, які були виявлені Mapillary на їх знімках"
-
-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 "Неможливо зчитати за посиланням URL {0}!"
-
-msgid ""
-"{0}\n"
-"Could not read map objects from URL\n"
-"{1}!"
-msgstr ""
-"{0}\n"
-"Не вийшло отримати обʼєкти мапи за посиланням URL\n"
-"{1}!"
-
-msgid "everything in the visible area"
-msgstr "все, що є у видимій області"
-
-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 ""
-"Завантаження знімків до шару Mapillary призупинено через надмірну розмір "
-"ділянки для завантаження!"
-
-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 ""
-"Для розвʼязання цієї проблеми ви можете перемикнутися в режим завантаження "
-"''{0}'' та завантажити знімки Mapillary для меншої ділянки мапи."
-
-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"
 
@@ -31545,6 +31082,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 ""
+"Цей інструмент в змозі замінювати точки, оновлювати точку до лінії, чи лінію "
+"до мультиполігону, та замінювати лінію лінією"
+
+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 "Узагальнення будівель"
 
@@ -31581,9 +31225,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 "Дані: {0}"
+
+msgid "Set building shape to rectangle"
+msgstr "Зробити контур будівлі прямокутним"
+
+msgid "Set buildings shape to rectangle"
+msgstr "Зробити контури будівель прямокутними"
+
 msgid "Set buildings size"
 msgstr "Встановити розмір будівель"
 
@@ -31596,8 +31261,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 "Довжина кроку:"
@@ -32345,6 +32019,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 "Злиття"
 
@@ -32870,6 +32556,9 @@ msgstr "Відкрити панель ГеоЧату"
 msgid "Zoom in to see messages"
 msgstr "Наблизитись, щоб побачити повідомлення"
 
+msgid "Login"
+msgstr "Увійти"
+
 msgid "Enable autologin"
 msgstr "Входити автоматично"
 
@@ -32903,24 +32592,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 "Тільки положення"
 
@@ -33011,6 +32691,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 \"бах!\""
 
@@ -33745,8 +33428,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 "Натисніть спочатку пробіл, щоб додати об''єкт \"outer\" до зв''язка."
+
+msgid "Relation-Error"
+msgstr "Помилка зв''язку"
+
+msgid "No data selected."
+msgstr "Нічого не виділено."
+
+msgid "No relation or no relation member with role \"outer\" selected."
+msgstr "Не виділено зв''язок або член зв''язка з роллю \"outer\"."
 
 msgid "POWER"
 msgstr "ВМК/ВИМК"
@@ -33778,36 +33479,103 @@ msgstr "Вкажіть номер для приміщення, якщо обра
 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 "Вибір поверха"
+"<html> Введіть номер для створюємого поверху. <br> <i>Інформація</ i>: "
+"<br>При натисканні кнопки Так ви перейдете в режим креслення. <br> Щоб "
+"закінчити креслення, натисніть пробіл. Теґи для нового поверху<br>будуть "
+"додані автоматично. </html>"
 
-msgid "Lowest Level"
-msgstr "Найнижчій поверх"
+msgid "level number:"
+msgstr "Номер поверха:"
 
-msgid "The lowest level of your building."
-msgstr "Самий нижній поверх будівлі."
+msgid "Example: ''2'' or ''3''"
+msgstr "Наприклад: \"2\" або \"3\""
 
-msgid "Highest Level"
-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 "<html><b>?</strong></b>"
+
+msgid "Show Help-Browser."
+msgstr "Показати Довідку"
+
+msgid "Level name"
+msgstr "Назва поверху"
+
+msgid "Sets optional name tag for a level."
+msgstr "Необов''язкова назва для поверху (теґ level_name)"
+
+msgid "Working level: NONE"
+msgstr "Поверх: НІ"
+
+msgid "Shows the current working level."
+msgstr "Показати поточний поверх."
+
+msgid "Deactivate automatic level tagging."
+msgstr "Вимкнути автоматичне додавання теґів поверхам."
+
+msgid "Sets the name tag."
+msgstr "Задає значення теґу name."
+
+msgid "Sets the referance tag."
+msgstr "Задає значення теґу ref."
+
+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 ""
+"Задає значення теґу repeat_on, якщо виділено об’єкт з теґом highway. "
+"Наприклад: -3-4 або -2--3 чи 5-6."
+
+msgid "OUTER"
+msgstr "OUTER"
+
+msgid ""
+"Creation-Tool for multipolygon with role: outer. To finish press the "
+"spacebar."
+msgstr ""
+"Створює члена мультиполігона з роллю outer. Натисніть пробіл для завершення."
+
+msgid "INNER"
+msgstr "INNER"
+
+msgid ""
+"Creation-Tool for multipolygons with role: inner. To finish press spacebar. "
+"To add to relation select \"outer\" and press enter."
+msgstr ""
+"Створює члена мультиполігона з роллю inner. Натисніть пробіл для завершення. "
+"Для додавання до зв’язку виділіть \"outer\" та натисніть Enter."
+
+msgid "Deactivate multipolygon function."
+msgstr "Вимкнути функцію створення мультиполігонів."
+
+msgid "Add selected tags and/or relations to obeject."
+msgstr ""
+
+msgid "Working level: {0}"
+msgstr "Поверх: {0}"
+
 msgid "InfoMode"
 msgstr "ІнфоРежим"
 
@@ -34981,6 +34749,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"
 
@@ -35321,6 +35110,9 @@ msgstr "Реагувати GPS-дані знімка"
 msgid "Please select an image first."
 msgstr "Оберіть спочатку знімок."
 
+msgid "No image selected"
+msgstr "Не обрано жодного зображення"
+
 msgid "(Empty values delete the according fields.)"
 msgstr "(Порожні значення видаляють відповідні поля.)"
 
@@ -36093,6 +35885,9 @@ msgstr "неявно"
 msgid "State"
 msgstr "Штат"
 
+msgid "pending"
+msgstr "у черзі"
+
 msgid "[incomplete]"
 msgstr "[неповний]"
 
@@ -36513,12 +36308,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>"
@@ -36882,12 +36671,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 "Підсвічування"
 
@@ -38621,48 +38404,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 "Змінити членство у звʼязку"
 
@@ -38741,9 +38482,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/ur.po b/i18n/po/ur.po
index 7bc7765..e054867 100644
--- a/i18n/po/ur.po
+++ b/i18n/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2010-05-13 04:15+0000\n"
 "Last-Translator: Shoaib Mirza <Unknown>\n"
 "Language-Team: Urdu <ur at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:05+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:06+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: ur\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/vi.po b/i18n/po/vi.po
index c47499a..e527139 100644
--- a/i18n/po/vi.po
+++ b/i18n/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2015-05-14 20:17+0000\n"
 "Last-Translator: Mạnh <laituanmanh32 at gmail.com>\n"
 "Language-Team: Vietnamese <vi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:06+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:06+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: vi\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -1012,8 +1012,8 @@ msgstr "Nhập URL để tải về:"
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Nhập một URL từ nơi dữ liệu phải được tải về"
 
-msgid "Separate Layer"
-msgstr "Layer riêng biệt"
+msgid "Download as new layer"
+msgstr "Tải về dưới layer mới"
 
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "Chọn nếu các dữ liệu cần được tải về vào một layer mới"
@@ -2403,12 +2403,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"
@@ -8719,9 +8719,6 @@ msgstr "Giá trị vĩ độ trong khoảng [-90,90] yêu cầu."
 msgid "Value for longitude in range [-180,180] required."
 msgstr "Giá trị kinh độ trong phạm vi [-180.180] yêu cầu."
 
-msgid "Download as new layer"
-msgstr "Tải về dưới layer mới"
-
 msgid ""
 "<html>Select to download data into a new data layer.<br>Unselect to download "
 "into the currently active data layer.</html>"
@@ -10319,6 +10316,9 @@ msgstr "Không tìm thấy dữ liệu trong tập tin '' {0} ''."
 msgid "Open OSM file"
 msgstr "Mở tập tin OSM"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -13573,9 +13573,6 @@ msgstr "điều khiển từ xa"
 msgid "Settings for the remote control feature."
 msgstr "Cài đặt cho tính năng điều khiển từ xa."
 
-msgid "Download objects to new layer"
-msgstr "Tải về đối tượng cho lớp mới"
-
 msgid "Confirm all Remote Control actions manually"
 msgstr "Xác nhận tất cả các hành động điều khiển từ xa bằng tay"
 
@@ -15444,6 +15441,11 @@ msgstr "Giữ plugin"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "Nhấn vào đây để giữ cho các plugin '' {0} ''"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+"Không thể cài đặt plugin '' {0} '' từ tải tập tin tạm thời '' {1} ''. {2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "Không thể xóa các plugin đã lỗi thời '' {0} ''."
 
@@ -15455,11 +15457,6 @@ msgstr ""
 "đang để tải các phiên bản plugin cũ."
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr ""
-"Không thể cài đặt plugin '' {0} '' từ tải tập tin tạm thời '' {1} ''. {2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr ""
@@ -17405,10 +17402,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "kiosk"
-
 msgid "Start date"
 msgstr "Ngày bắt đầu"
 
@@ -18913,6 +18906,9 @@ msgstr "Bio Diesel"
 msgid "Octane 80"
 msgstr "Octane 80"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "Octane 91"
 
@@ -18934,6 +18930,9 @@ msgstr "E10 (10% Ethanol pha trộn)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol pha trộn)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (khí dầu mỏ hóa lỏng)"
 
@@ -21591,6 +21590,12 @@ msgstr "Fountain"
 msgid "Water Well"
 msgstr "Nước Vâng"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "Ngọn hải đăng"
 
@@ -24687,6 +24692,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"
 
@@ -24768,7 +24800,7 @@ msgstr "OSM Inspector: Địa chỉ"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -24783,7 +24815,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 ""
@@ -24791,21 +24823,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 ""
 
@@ -24944,13 +24998,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"
@@ -24983,14 +25037,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 ""
@@ -25056,7 +25110,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)"
@@ -25143,13 +25197,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)"
@@ -25317,34 +25371,33 @@ msgstr ""
 msgid "Kelowna Roads overlay"
 msgstr "Kelowna Đường 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 ""
@@ -25352,7 +25405,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)"
@@ -25400,7 +25453,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -25408,7 +25461,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 ""
@@ -25579,8 +25632,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 ""
@@ -25588,9 +25640,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 ""
@@ -25598,10 +25648,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"
@@ -25634,57 +25684,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 ""
@@ -25692,13 +25737,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 ""
@@ -25766,13 +25811,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 ""
@@ -25780,7 +25825,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -25788,7 +25833,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -25796,19 +25841,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 ""
@@ -25913,13 +25958,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 ""
@@ -25927,7 +25972,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)"
@@ -26021,13 +26066,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 ""
 
@@ -26115,6 +26153,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 ""
 
@@ -26123,6 +26175,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 ""
 
@@ -26130,13 +26206,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 ""
@@ -26150,7 +26226,7 @@ msgstr "Dải Gaza - Pléiades - 2014/07/06"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "Dải Gaza - Pléiades - 2014/07/06 (NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
+msgid "imagico.de: Panama Canal - Pacific side"
 msgstr ""
 
 msgid ""
@@ -26158,29 +26234,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)"
@@ -26249,7 +26324,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"
@@ -26282,6 +26360,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 ""
 
@@ -26330,33 +26414,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 ""
@@ -26364,7 +26446,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)"
@@ -26410,25 +26492,25 @@ msgstr ""
 msgid "South Africa CD:NGI Aerial"
 msgstr "Nam Phi 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"
@@ -26452,7 +26534,7 @@ msgstr "IDEIB - Quần đảo Balearic"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - Quần đảo Canary"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
+msgid "imagico.de: Adams Bridge"
 msgstr ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -26548,7 +26630,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 ""
@@ -26556,6 +26638,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 ""
 
@@ -26574,7 +26663,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)"
@@ -26636,7 +26725,7 @@ msgstr ""
 msgid "U.S. Forest Service roads"
 msgstr "Lâm nghiệp Hoa Kỳ con đường"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
+msgid "imagico.de: Alaska Range"
 msgstr ""
 
 msgid ""
@@ -26644,13 +26733,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)"
@@ -26737,7 +26826,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 ""
@@ -26745,7 +26841,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"
@@ -26760,6 +26856,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr "Series 7 (OS7)"
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr "hệ điều hành mới Popular bản lịch sử"
 
@@ -27765,46 +27867,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}: mét là mặc định; thời gian là dấu phân cách, nếu đơn vị, đưa không gian "
-"sau đó đơn vị"
 
 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 "không bình thường {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 "điện áp phải ở trong volts không có đơn vị / delimiter / không gian"
 
-msgid "unusual {0} specification"
-msgstr "không bình thường {0} đặc điểm kỹ thuật"
-
-msgid "unusual train track gauge; use mm with no separator"
-msgstr ""
-"không bình thường tàu theo dõi đo lường; sử dụng mm không có dấu phân cách"
-
-msgid "unusual incline; use percentages/degrees or up/down"
-msgstr "nghiêng bất thường; sử dụng tỷ lệ phần trăm / độ hoặc lên / xuống"
-
 msgid "{0} must be a numeric value"
 msgstr "{0} phải là một giá trị số"
 
 msgid "{0} must be a positive integer number"
 msgstr "{0} phải là một số nguyên dương"
 
-msgid "unusual value of {0}"
-msgstr ""
-
 msgid "{0} must be a numeric value, in meters and without units"
 msgstr ""
 
@@ -27911,6 +28003,9 @@ msgstr "Ẩn biểu tượng ở zoom thấp"
 msgid "Less obtrusive node symbols at low zoom"
 msgstr "biểu tượng nút Ít gây khó chịu ở zoom thấp"
 
+msgid "Hide tagged waynodes at low zoom"
+msgstr ""
+
 msgid "Display street labels (at high zoom)"
 msgstr "nhãn đường Display (tại zoom cao)"
 
@@ -27961,6 +28056,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."
@@ -28004,6 +28102,9 @@ msgstr ""
 "Thực hiện một dòng lệnh và cho phép tạo ra các lệnh của bạn. Xem liên kết "
 "choLệnh chuẩn (arc, hình tròn vv)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -28058,6 +28159,11 @@ msgstr ""
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "Xử lý EPCIs Pháp (ranh giới = local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "Sử dụng kịch bản bên ngoài trong JOSM"
 
@@ -28265,6 +28371,9 @@ msgstr ""
 "Cho phép mở GPX / file OSM giao với phần diện tích màn hình hiện thời hiển "
 "thị"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
@@ -29125,550 +29234,6 @@ msgstr "Import image tham chiếu hình học"
 msgid "Error while creating image layer: "
 msgstr "Lỗi khi tạo lớp hình ảnh: "
 
-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 "Mapillary"
-
-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 "cấp phát"
-
-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 "Đăng nhập"
-
-msgid "Logout"
-msgstr "Thoát"
-
-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 "nhập khẩu"
-
-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"
 
@@ -30466,6 +30031,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 ""
+"Công cụ này chỉ có thể thay thế một nút, nâng cấp một nút đến một cách hay "
+"mộtMultipolygon, hoặc thay thế một cách có một cách."
+
+msgid "Cannot replace relations"
+msgstr ""
+
+msgid "Node belongs to way(s), cannot replace."
+msgstr "Node thuộc về cách (s), không thể thay thế."
+
+msgid "Relation is not a multipolygon, cannot be used as a replacement."
+msgstr ""
+"Mối quan hệ không phải là một multipolygon, không thể được sử dụng như là "
+"một thay thế."
+
+msgid "Replace geometry for node {0}"
+msgstr "Thay thế hình học cho nút {0}"
+
+msgid ""
+"Please select one way that exists in the database and one new way with "
+"correct geometry."
+msgstr ""
+"Hãy chọn một trong những cách tồn tại trong cơ sở dữ liệu và một trong những "
+"cách mới vớiHình học chính xác."
+
+msgid "The ways must be entirely within the downloaded area."
+msgstr "Những cách phải hoàn toàn nằm trong khu vực được tải về."
+
+msgid ""
+"The way to be replaced cannot have any nodes with properties or relation "
+"memberships unless they belong to both ways."
+msgstr ""
+"Cách để được thay thế không thể có bất kỳ nút với tài sản hoặc mối quan "
+"hệThành viên trừ khi họ thuộc về cả hai cách."
+
+msgid "Exceeded iteration limit for robust method, using simpler method."
+msgstr ""
+"Vượt quá giới hạn cho phép lặp phương pháp mạnh mẽ, sử dụng phương pháp đơn "
+"giản."
+
+msgid "Replace geometry for way {0}"
+msgstr "Thay thế hình học cho cách {0}"
+
+msgid "Too many ways are added: {0}!"
+msgstr "Quá nhiều cách được thêm vào: {0}"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -30499,9 +30172,30 @@ msgstr "Buildings tags:"
 msgid "Cannot place building outside of the world."
 msgstr "Không thể thực hiện xây dựng bên ngoài của thế giới."
 
+msgid "Add nodes for building"
+msgstr ""
+
 msgid "Create building"
 msgstr "Tạo dựng"
 
+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 "Set tòa size"
 
@@ -30514,8 +30208,17 @@ msgstr "xây dựng tự động chọn"
 msgid "Use address nodes under buildings"
 msgstr "Sử dụng các nút địa chỉ dưới các tòa nhà"
 
-msgid "Buildings width:"
-msgstr "Các tòa nhà rộng:"
+msgid "Circle"
+msgstr ""
+
+msgid "Rectangle"
+msgstr ""
+
+msgid "Set buildings size and shape"
+msgstr ""
+
+msgid "Buildings width/diameter:"
+msgstr ""
 
 msgid "Length step:"
 msgstr "Chiều dài bước:"
@@ -31256,6 +30959,18 @@ msgstr "Xóa các chương trình được lựa chọn từ danh sách."
 msgid "Color Schemes"
 msgstr "Color Schemes"
 
+msgid "Task config"
+msgstr ""
+
+msgid "Add New Config Task"
+msgstr ""
+
+msgid "Abort tag editing and close dialog"
+msgstr "Abort chỉnh sửa từ khóa và đóng hộp thoại"
+
+msgid "Apply edited tags and close dialog"
+msgstr "Áp dụng thẻ đã được chỉnh sửa và đóng hộp thoại"
+
 msgid "Conflation"
 msgstr "Conflation"
 
@@ -31753,6 +31468,9 @@ msgstr "Open bảng GeoChat"
 msgid "Zoom in to see messages"
 msgstr "Phóng to để xem tin nhắn"
 
+msgid "Login"
+msgstr "Đăng nhập"
+
 msgid "Enable autologin"
 msgstr "Bật AutoLogin"
 
@@ -31784,24 +31502,15 @@ msgstr "chuyện riêng"
 msgid "Close tab"
 msgstr "Close Tab"
 
+msgid "Logout"
+msgstr "Thoát"
+
 msgid "Clear log"
 msgstr "Xóa nhật ký"
 
 msgid "Show users on map"
 msgstr "Hiện người dùng trên bản đồ"
 
-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 "Vị trí chỉ"
 
@@ -31892,6 +31601,9 @@ msgstr "Globalsat nhập khẩu"
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Nhập dữ liệu từ Globalsat Datalogger DG100 vào lớp GPX."
 
+msgid "Import"
+msgstr "nhập khẩu"
+
 msgid "GPS Blams"
 msgstr "GPS Blams"
 
@@ -32631,7 +32343,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"
@@ -32664,31 +32394,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"
@@ -33837,6 +33628,27 @@ msgstr "Không rõ phần mở rộng tập: {0}"
 msgid "Parsing file \"{0}\" failed"
 msgstr "Phân tích cú pháp tập tin \" {0} \"thất bại"
 
+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"
 
@@ -34175,6 +33987,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr ""
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -34923,6 +34738,9 @@ msgstr "tiềm ẩn"
 msgid "State"
 msgstr "Nhà nước"
 
+msgid "pending"
+msgstr "cấp phát"
+
 msgid "[incomplete]"
 msgstr "[không đầy đủ]"
 
@@ -35344,12 +35162,6 @@ msgstr "giá trị mới cho {0}"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr "Preference '' {0} '' mất tích. Không thể khởi tạo SdsApi."
 
-msgid "Failed to open connection to API {0}."
-msgstr "Không thể mở kết nối đến {0} API."
-
-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>"
@@ -35712,12 +35524,6 @@ msgstr "JOSM Tag Editor Plugin"
 msgid "Presets"
 msgstr "Presets"
 
-msgid "Abort tag editing and close dialog"
-msgstr "Abort chỉnh sửa từ khóa và đóng hộp thoại"
-
-msgid "Apply edited tags and close dialog"
-msgstr "Áp dụng thẻ đã được chỉnh sửa và đóng hộp thoại"
-
 msgid "Highlight"
 msgstr "Highlight"
 
@@ -37406,49 +37212,6 @@ msgstr ""
 "Công cụ này thay thế hình học của một đối tượng với nhau, và do đó đòi "
 "hỏiChính xác hai đối tượng được lựa chọn."
 
-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 ""
-"Công cụ này chỉ có thể thay thế một nút, nâng cấp một nút đến một cách hay "
-"mộtMultipolygon, hoặc thay thế một cách có một cách."
-
-msgid "Node belongs to way(s), cannot replace."
-msgstr "Node thuộc về cách (s), không thể thay thế."
-
-msgid "Replace geometry for node {0}"
-msgstr "Thay thế hình học cho nút {0}"
-
-msgid "Relation is not a multipolygon, cannot be used as a replacement."
-msgstr ""
-"Mối quan hệ không phải là một multipolygon, không thể được sử dụng như là "
-"một thay thế."
-
-msgid ""
-"Please select one way that exists in the database and one new way with "
-"correct geometry."
-msgstr ""
-"Hãy chọn một trong những cách tồn tại trong cơ sở dữ liệu và một trong những "
-"cách mới vớiHình học chính xác."
-
-msgid "The ways must be entirely within the downloaded area."
-msgstr "Những cách phải hoàn toàn nằm trong khu vực được tải về."
-
-msgid ""
-"The way to be replaced cannot have any nodes with properties or relation "
-"memberships unless they belong to both ways."
-msgstr ""
-"Cách để được thay thế không thể có bất kỳ nút với tài sản hoặc mối quan "
-"hệThành viên trừ khi họ thuộc về cả hai cách."
-
-msgid "Exceeded iteration limit for robust method, using simpler method."
-msgstr ""
-"Vượt quá giới hạn cho phép lặp phương pháp mạnh mẽ, sử dụng phương pháp đơn "
-"giản."
-
-msgid "Replace geometry for way {0}"
-msgstr "Thay thế hình học cho cách {0}"
-
 msgid "Replace Membership"
 msgstr ""
 
@@ -37522,9 +37285,6 @@ msgstr "Chọn nút giữa"
 msgid "Please select two nodes connected by way!"
 msgstr "Hãy chọn hai nút kết nối bằng cách nào!"
 
-msgid "Too many ways are added: {0}!"
-msgstr "Quá nhiều cách được thêm vào: {0}"
-
 msgid "All inside [testing]"
 msgstr "Tất cả trong [thử nghiệm]"
 
diff --git a/i18n/po/wae.po b/i18n/po/wae.po
index fe3ee78..bfd9c95 100644
--- a/i18n/po/wae.po
+++ b/i18n/po/wae.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2016-03-09 22:17+0000\n"
 "Last-Translator: Simon Legner <Unknown>\n"
 "Language-Team: Walser <wae at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:10+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"
 
 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/zh_CN.po b/i18n/po/zh_CN.po
index 4a1aa65..cc8c669 100644
--- a/i18n/po/zh_CN.po
+++ b/i18n/po/zh_CN.po
@@ -10,16 +10,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-11-28 04:16+0000\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
+"PO-Revision-Date: 2018-01-28 10:01+0000\n"
 "Last-Translator: Austin Zhu <Unknown>\n"
 "Language-Team: 汉语 <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:08+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:09+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: zh_CN\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -952,8 +952,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 "如果数据要下载到新的图层里,请选择此项"
@@ -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"
@@ -8253,9 +8253,6 @@ msgstr "纬度的数值范围必须为 [-90,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>"
@@ -9732,6 +9729,9 @@ msgstr "文件“{0}”中未找到数据。"
 msgid "Open OSM file"
 msgstr "打开 OSM 文件"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr "验证错误文件"
 
@@ -12827,9 +12827,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 "手动确认所有的远程控制行为"
 
@@ -14523,6 +14520,10 @@ msgstr "保留插件"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "点击以保留插件“{0}”"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr "无法从临时下载文件“{1}”中安装插件“{0}”。{2}"
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "无法删除过期插件“{0}”。"
 
@@ -14532,10 +14533,6 @@ msgid ""
 msgstr "无法安装已下载插件“{0}”。正在跳过安装。JOSM 仍然加载旧版本插件。"
 
 msgid ""
-"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
-msgstr "无法从临时下载文件“{1}”中安装插件“{0}”。{2}"
-
-msgid ""
 "Failed to install plugin ''{0}'' from temporary download file ''{1}''. "
 "Renaming failed."
 msgstr "无法从临时下载文件“{1}”中安装插件“{0}”。重命名失败。"
@@ -16383,10 +16380,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "亭"
-
 msgid "Start date"
 msgstr "启用日期"
 
@@ -17872,6 +17865,9 @@ msgstr "生物柴油"
 msgid "Octane 80"
 msgstr "80 号"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "91 号"
 
@@ -17893,6 +17889,9 @@ msgstr "E10(添加 10% 乙醇)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85(添加 85% 乙醇)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "液化石油气(LPG)"
 
@@ -20546,6 +20545,12 @@ msgstr "喷泉"
 msgid "Water Well"
 msgstr "水井"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "灯塔"
 
@@ -23621,6 +23626,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"
 
@@ -23702,8 +23734,8 @@ msgstr "OSM 检查器:地址"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM 检查器:海岸(欧洲)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
-msgstr "imagico.de 授权绘制的OSM图像: 北阿尔巴尼亚山"
+msgid "imagico.de: Prokletije Mountains"
+msgstr "imagico.de: 北阿尔巴尼亚山"
 
 msgid ""
 "Late summer imagery where usual sources are severely limited by clouds and "
@@ -23717,29 +23749,51 @@ msgid ""
 "Streets & Builings provided by the Muncipality of Tirana hosted by Open Labs"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southern Transantarctic Mountains"
-msgstr "imagico.de 授权绘制的OSM图像: 横贯南极山脉南部"
+msgid "imagico.de: Southern Transantarctic Mountains"
+msgstr "imagico.de: 横贯南极山脉南部"
 
 msgid ""
 "Outside regular Landsat coverage and therefore not in LIMA and Bing/Mapbox "
 "(true color)"
 msgstr "在常规Landsat图像覆盖之外,也不在LIMA和Bing / Mapbox图像中(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Pensacola Mountains"
-msgstr "imagico.de 授权绘制的OSM图像: 彭萨科拉山脉"
+msgid "imagico.de: Pensacola Mountains"
+msgstr "imagico.de: 彭萨科拉山脉"
 
-msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
-msgstr "imagico.de 授权绘制的OSM图像: 大象岛/克拉伦斯岛"
+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"
-msgstr "imagico.de 授权绘制的OSM图像: 恩德比地和肯普海岸"
+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: 恩德比地和肯普海岸"
 
 msgid "Sentinel-2 images of Enderby Land and Kemp Coast (true color)"
 msgstr "Sentinel-2拍摄的恩德比地和肯普海岸图像(真彩色)"
 
+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 地形地图(TMS)"
 
@@ -23878,14 +23932,14 @@ msgstr "阿根廷农业部 (WMS)"
 msgid "Ministry of Energy and Mining (WMS)"
 msgstr "阿根廷能源与矿业部 (WMS)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (low tide)"
-msgstr "imagico.de 授权绘制的OSM图像: 布兰卡港 (低潮)"
+msgid "imagico.de: Bahía Blanca (low tide)"
+msgstr "imagico.de: 布兰卡港 (低潮)"
 
 msgid "Tidal flats and islands at the coast (true color)"
 msgstr "海岸的潮滩与岛屿 (true color)"
 
-msgid "imagico.de OSM images for mapping: Bahía Blanca (high tide)"
-msgstr "imagico.de 授权绘制的OSM图像: 布兰卡港 (高潮)"
+msgid "imagico.de: Bahía Blanca (high tide)"
+msgstr "imagico.de: 布兰卡港 (高潮)"
 
 msgid "AGRI black-and-white 2.5m"
 msgstr "AGRI黑白2.5米"
@@ -23917,15 +23971,15 @@ msgstr "LPI NSW 国家林区行政边界"
 msgid "LPI NSW Administrative Boundaries NPWS Reserve"
 msgstr "LPI NSW NPWS保护区行政边界"
 
-msgid "imagico.de OSM images for mapping: Northwest Heard Island"
-msgstr "imagico.de 授权绘制的OSM图像: 赫德岛西北部"
+msgid "imagico.de: Northwest Heard Island"
+msgstr "imagico.de: 赫德岛西北部"
 
 msgid ""
 "Glaciers of Northwest Heard Island (mapped meanwhile) (false color IR)"
 msgstr "赫德岛西北部的冰川(同时绘制) (假色IR)"
 
-msgid "imagico.de OSM images for mapping: Heard Island coast"
-msgstr "imagico.de 授权绘制的OSM图像: 赫德岛海岸"
+msgid "imagico.de: Heard Island coast"
+msgstr "imagico.de: 赫德岛海岸"
 
 msgid ""
 "Recent image of Heard island with interior mostly cloud covered but mostly "
@@ -23990,8 +24044,8 @@ msgstr "VoGIS: 分区规划"
 msgid "VoGIS: Höhen und Gelände"
 msgstr "VoGIS: 地高和地形"
 
-msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
-msgstr "imagico.de 授权绘制的OSM图像: 里拉和皮林山脉"
+msgid "imagico.de: Rila and Pirin Mountains"
+msgstr "imagico.de: 里拉和皮林山脉"
 
 msgid "OpenStreetMap (Belgian Style)"
 msgstr "OpenStreetMap (比利时风格)"
@@ -24077,14 +24131,14 @@ msgstr "TEC 公交站"
 msgid "Benin: Cotonou Pleiade 2016"
 msgstr "贝宁: 科托努 (2016年)"
 
-msgid "imagico.de OSM images for mapping: Cotonou"
-msgstr "imagico.de 授权绘制的OSM图像: 科托努"
+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"
-msgstr "imagico.de 授权绘制的OSM图像: 布韦岛"
+msgid "imagico.de: Bouvet Island"
+msgstr "imagico.de: 布韦岛"
 
 msgid "For more accurate coastline and glacier mapping (true color)"
 msgstr "用于更加精确的海岸线和冰川绘制(真彩色)"
@@ -24251,43 +24305,42 @@ msgstr "基洛纳的高质量航拍图像"
 msgid "Kelowna Roads overlay"
 msgstr "基洛纳 (道路叠加)"
 
-msgid "imagico.de OSM images for mapping: Eastern Devon Island coast"
-msgstr "imagico.de 授权绘制的OSM图像: 德文岛东部海岸"
+msgid "imagico.de: Eastern Devon Island coast"
+msgstr "imagico.de: 德文岛东部海岸"
 
 msgid "Coastline mostly mapped meanwhile (false color IR)"
 msgstr "同时绘制了大多数的海岸线 (假色 IR)"
 
-msgid "imagico.de OSM images for mapping: Northern Ellesmere Island"
-msgstr "imagico.de 授权绘制的OSM图像: 埃尔斯米尔岛北部"
+msgid "imagico.de: Northern Ellesmere Island"
+msgstr "imagico.de: 埃尔斯米尔岛北部"
 
 msgid ""
 "Assembled from July 2012 ASTER imagery (true color with estimated blue)"
 msgstr "从2012年7月 ASTER 图像中整合 (真彩色包含预测的蓝色)"
 
-msgid ""
-"imagico.de OSM images for mapping: Northern Ellesmere Island July 2016"
-msgstr "imagico.de 授权绘制的OSM图像: 埃尔斯米尔岛北部(2016年7月)"
+msgid "imagico.de: Northern Ellesmere Island July 2016"
+msgstr "imagico.de: 埃尔斯米尔岛北部(2016年7月)"
 
 msgid ""
 "Assembled from July 2016 ASTER imagery (true color with estimated blue)"
 msgstr "从2016年7月ASTER图像中整合(真彩色包含预测的蓝色)"
 
-msgid "imagico.de OSM images for mapping: Fogo, Cape Verde"
-msgstr "imagico.de 授权绘制的OSM图像: 福古岛(佛得角)"
+msgid "imagico.de: Fogo, Cape Verde"
+msgstr "imagico.de: 福古岛(佛得角)"
 
 msgid "Image from after the 2014/2015 eruption (true color)"
 msgstr "在2014年/2015年火山喷发后的图像 (真彩色)"
 
-msgid "imagico.de OSM images for mapping: Isla Londonderry"
-msgstr "imagico.de 授权绘制的OSM图像: 伦敦德里岛"
+msgid "imagico.de: Isla Londonderry"
+msgstr "imagico.de: 伦敦德里岛"
 
 msgid ""
 "A lot of very coarse coastlines could be improved here, much snow cover "
 "though so no use for glacier mapping (false color IR)"
 msgstr "可以用来改善许多粗糙的海岸线,有许多积雪所以请勿用于绘制冰川(假色IR)"
 
-msgid "imagico.de OSM images for mapping: Volcán Calbuco"
-msgstr "imagico.de 授权绘制的OSM图像: 卡尔布科火山"
+msgid "imagico.de: Volcán Calbuco"
+msgstr "imagico.de: 卡尔布科火山"
 
 msgid "Image from after the 2015 eruption (true color)"
 msgstr "在2015年火山喷发后的图像 (真彩色)"
@@ -24334,16 +24387,16 @@ msgstr "Stevns"
 msgid "Vejmidte"
 msgstr "Vejmidte"
 
-msgid "imagico.de OSM images for mapping: El Altar"
-msgstr "imagico.de 授权绘制的OSM图像: 埃尔阿尔塔火山"
+msgid "imagico.de: El Altar"
+msgstr "imagico.de: 埃尔阿尔塔火山"
 
 msgid ""
 "2007 ASTER image offering better glacier coverage than common sources (true "
 "color with estimated blue)"
 msgstr "2007年的ASTER图像提供了比普通来源更好的冰川覆盖(真彩色包含预测的蓝色)"
 
-msgid "imagico.de OSM images for mapping: Darwin and Wolf islands, Galapagos"
-msgstr "imagico.de 授权绘制的OSM图像: 达尔文岛和沃尔夫岛(加拉帕戈斯群岛)"
+msgid "imagico.de: Darwin and Wolf islands, Galapagos"
+msgstr "imagico.de: 达尔文岛和沃尔夫岛(加拉帕戈斯群岛)"
 
 msgid ""
 "Recent image, only old and poor images in other sources currently (true "
@@ -24511,30 +24564,27 @@ msgstr "Maps4BW (LGL-BW, www.lgl-bw.de)"
 msgid "Metropole Ruhr: Luftbilder (10 cm)"
 msgstr "大都会鲁尔: 航拍图像 (10 cm)"
 
-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)"
-msgstr "imagico.de 授权绘制的OSM图像: 德国北部西海岸潮滩(红外线)"
+msgid "imagico.de: Northern German west coast tidalflats (infrared)"
+msgstr "imagico.de: 德国北部西海岸潮滩(红外线)"
 
 msgid ""
 "Up-to-date low tide imagery of the coast for updating mapping of tidalflats "
 "and shoals (false color IR)"
 msgstr "最新的海岸低潮时的图像,用于更新潮滩和浅滩(假色IR)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
-msgstr "imagico.de 授权绘制的OSM图像: 北海海岸 (2016年)"
+msgid "imagico.de: North Sea Coast 2016"
+msgstr "imagico.de: 北海海岸 (2016年)"
 
-msgid "imagico.de OSM images for mapping: North Sea Coast 2017"
-msgstr "imagico.de 授权绘制的OSM图像: 北海海岸 (2017年)"
+msgid "imagico.de: North Sea Coast 2017"
+msgstr "imagico.de: 北海海岸 (2017年)"
 
 msgid "Saxony latest aerial imagery"
 msgstr "萨克森最新航拍图像"
@@ -24566,72 +24616,67 @@ msgstr "美因茨最新航拍图像"
 msgid "Munich latest aerial imagery 60cm"
 msgstr "慕尼黑最新航拍图像(60厘米)"
 
-msgid "imagico.de OSM images for mapping: Qasigiannguit"
-msgstr "imagico.de 授权绘制的OSM图像: 卡西江吉特"
+msgid "imagico.de: Qasigiannguit"
+msgstr "imagico.de: 卡西江吉特"
 
 msgid "Icebridge DMS image of the settlement - alignment might be poor"
 msgstr "Icebridge DMS 聚落图像(可能有校准问题)"
 
-msgid "imagico.de OSM images for mapping: Thule Air Base"
-msgstr "imagico.de 授权绘制的OSM图像: 图勒空军基地"
+msgid "imagico.de: Thule Air Base"
+msgstr "imagico.de: 图勒空军基地"
 
 msgid "Icebridge DMS image - alignment might be poor"
 msgstr "Icebridge DMS图像(可能有校准问题)"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Autumn"
-msgstr "imagico.de 授权绘制的OSM图像: 康克鲁斯瓦格(秋季)"
+msgid "imagico.de: Kangerlussuaq Autumn"
+msgstr "imagico.de: 康克鲁斯瓦格(秋季)"
 
 msgid ""
 "Icebridge DMS image of the airport and settlement - alignment might be poor"
 msgstr "Icebridge DMS 机场与聚落图像(可能有校准问题)"
 
-msgid "imagico.de OSM images for mapping: Kangerlussuaq Spring"
-msgstr "imagico.de 授权绘制的OSM图像: 康克鲁斯瓦格(春季)"
+msgid "imagico.de: Kangerlussuaq Spring"
+msgstr "imagico.de: 康克鲁斯瓦格(春季)"
 
 msgid ""
 "Icebridge DMS image of the airport and roads - alignment might be poor"
 msgstr "Icebridge DMS 机场与道路图像(可能有校准问题)"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS low altitude overflight "
-"September 2015"
-msgstr "imagico.de 授权绘制的OSM图像: 图勒空军基地(DMS低空飞越)(2015年9月)"
+msgid "imagico.de: Thule Airbase DMS low altitude overflight September 2015"
+msgstr "imagico.de: 图勒空军基地(DMS低空飞越)(2015年9月)"
 
 msgid ""
 "Icebridge DMS aerial images from Thule Airbase - alignment might be poor"
 msgstr "Icebridge DMS 图勒空军基地航拍图像(可能有校准问题)"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight September "
-"2015"
-msgstr "imagico.de 授权绘制的OSM图像: 图勒空军基地(DMS飞越)(2015年9月)"
+msgid "imagico.de: Thule Airbase DMS overflight September 2015"
+msgstr "imagico.de: 图勒空军基地(DMS飞越)(2015年9月)"
 
-msgid ""
-"imagico.de OSM images for mapping: Thule Airbase DMS overflight October 2015"
-msgstr "imagico.de 授权绘制的OSM图像: 图勒空军基地(DMS飞越)(2015年10月)"
+msgid "imagico.de: Thule Airbase DMS overflight October 2015"
+msgstr "imagico.de: 图勒空军基地(DMS飞越)(2015年10月)"
 
-msgid "imagico.de OSM images for mapping: Greenland mosaic"
-msgstr "imagico.de 授权绘制的OSM图像: 格陵兰(拼贴)"
+msgid "imagico.de: Greenland mosaic"
+msgstr "imagico.de: 格陵兰(拼贴)"
 
 msgid "Landsat mosaic of Greenland (true color)"
 msgstr "Landsat格陵兰拼贴图 (真彩色)"
 
-msgid "imagico.de OSM images for mapping: May 2013 off-nadir Landsat"
-msgstr "imagico.de 授权绘制的OSM图像: Landsat天底图(2013年5月)"
+msgid "imagico.de: May 2013 off-nadir Landsat"
+msgstr "imagico.de: Landsat天底图(2013年5月)"
 
 msgid ""
 "First available image north of the regular Landsat limit, mostly with "
 "seasonal snow cover so difficult to interpret (true color)"
 msgstr "第一个展现常规Landsat限制以北区域的图像,大部分都被季节性的雪所覆盖因而难以解读(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Landsat off-nadir July 2016"
-msgstr "imagico.de 授权绘制的OSM图像: Landsat天底图(2016年7月)"
+msgid "imagico.de: Landsat off-nadir July 2016"
+msgstr "imagico.de: Landsat天底图(2016年7月)"
 
 msgid "Latest images north of the regular Landsat limit (true color)"
 msgstr "最新展现常规Landsat限制以北区域的图像(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Northern Greenland ASTER"
-msgstr "imagico.de 授权绘制的OSM图像: 格陵兰北部(ASTER)"
+msgid "imagico.de: Northern Greenland ASTER"
+msgstr "imagico.de: 格陵兰北部(ASTER)"
 
 msgid ""
 "Assembled from mostly 2012 ASTER imagery, some 2005 images mainly in the "
@@ -24698,50 +24743,50 @@ msgstr "OpenStreetMap 匈牙利 (徒步线路)"
 msgid "Hillshade Hungary"
 msgstr "匈牙利山体阴影"
 
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
-msgstr "imagico.de 授权绘制的OSM图像: 冰岛东部"
+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"
-msgstr "imagico.de 授权绘制的OSM图像: 库奇兰恩"
+msgid "imagico.de: Rann of Kutch"
+msgstr "imagico.de: 库奇兰恩"
 
 msgid ""
 "Land/water distinction difficult to properly map based on Bing/Mapbox images "
 "(false color IR)"
 msgstr "基于Bing/Mapbox图像很难正确绘制水陆分界线(假色IR)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
-msgstr "imagico.de 授权绘制的OSM图像: 苏迪曼山脉(2015年)"
+msgid "imagico.de: Sudirman Range 2015"
+msgstr "imagico.de: 苏迪曼山脉(2015年)"
 
 msgid ""
 "Older image of the Sudirman Range with no fresh snow showing glacier extent "
 "(true color)"
 msgstr "苏迪曼山脉的旧图像,没有新的积雪,展现出了冰川规模(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
-msgstr "imagico.de 授权绘制的OSM图像: 东南苏拉威西岛"
+msgid "imagico.de: Southeastern Sulawesi"
+msgstr "imagico.de: 东南苏拉威西岛"
 
 msgid ""
 "Missing islands and coarse coastline due to cloud cover in Bing, lakes could "
 "also use additional detail (true color)"
 msgstr "Bing图像由于有云层覆盖,遗漏岛屿且海岸线粗糙。更新的细节可以被用来绘制湖面(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Bakun Reservoir"
-msgstr "imagico.de 授权绘制的OSM图像: 巴贡水库"
+msgid "imagico.de: Bakun Reservoir"
+msgstr "imagico.de: 巴贡水库"
 
 msgid "Missing in older pre-2011 images (true color)"
 msgstr "在2011年以前的图像中缺少的部分(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Batam"
-msgstr "imagico.de 授权绘制的OSM图像: 巴丹岛"
+msgid "imagico.de: Batam"
+msgstr "imagico.de: 巴丹岛"
 
 msgid "Missing Islands in OSM (true color)"
 msgstr "在OSM中缺少的岛屿(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2016"
-msgstr "imagico.de 授权绘制的OSM图像: 苏迪曼山脉(2016年)"
+msgid "imagico.de: Sudirman Range 2016"
+msgstr "imagico.de: 苏迪曼山脉(2016年)"
 
 msgid ""
 "Cloud free image of the Sudirman Range but with fresh snow (true color)"
@@ -24845,28 +24890,28 @@ msgstr "日本GSI 正射影像"
 msgid "Japan GSI Standard Map"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Aral Sea (low water level)"
-msgstr "imagico.de 授权绘制的OSM图像: 咸海(低水位)"
+msgid "imagico.de: Aral Sea (low water level)"
+msgstr "imagico.de: 咸海(低水位)"
 
 msgid "Water and wetland extents, dams etc. (true color)"
 msgstr "水和湿地规模,大坝等(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Aral Sea (high water level)"
-msgstr "imagico.de 授权绘制的OSM图像: 咸海(高水位)"
+msgid "imagico.de: Aral Sea (high water level)"
+msgstr "imagico.de: 咸海(高水位)"
 
 msgid ""
 "Water and wetland extents, dams etc. - some remaining winter ice in the "
 "north (true color)"
 msgstr "水和湿地规模,大坝等 - 北部有一些残存的冰(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
-msgstr "imagico.de 授权绘制的OSM图像: 肯尼亚山(2016年)"
+msgid "imagico.de: Mount Kenya 2016"
+msgstr "imagico.de: 肯尼亚山(2016年)"
 
 msgid "Up-to-date image for glacier mapping (true color)"
 msgstr "最新用于冰川绘制的图像(真彩色)"
 
 msgid "USSR - Latvia"
-msgstr ""
+msgstr "USSR - 拉脱维亚"
 
 msgid "50cm ortho - Latvia"
 msgstr "50厘米正射影像 - 拉脱维亚"
@@ -24953,13 +24998,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 ""
 
@@ -25047,6 +25085,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 ""
 
@@ -25055,6 +25107,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 ""
 
@@ -25062,14 +25138,14 @@ msgid ""
 "Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Svalbard mosaic"
-msgstr "imagico.de 授权绘制的OSM图像: 斯瓦尔巴特群岛(拼贴)"
+msgid "imagico.de: Svalbard mosaic"
+msgstr "imagico.de: 斯瓦尔巴特群岛(拼贴)"
 
 msgid "Sentinel-2 mosaic of Svalbard (true color)"
 msgstr "Sentinel-2提供的斯瓦尔巴特拼贴图 (真彩色)"
 
-msgid "imagico.de OSM images for mapping: Western Karakoram"
-msgstr "imagico.de 授权绘制的OSM图像: 喀喇昆仑山脉西部"
+msgid "imagico.de: Western Karakoram"
+msgstr "imagico.de: 喀喇昆仑山脉西部"
 
 msgid ""
 "Represents approximately minimum snow cover so can be well used for glacier "
@@ -25082,38 +25158,37 @@ msgstr "加沙地带(Pléiades)(2014/07/06)"
 msgid "Gaza Strip - Pléiades - 2014/07/06 (NIR)"
 msgstr "加沙地带(Pléiades)(2014/07/06)(NIR)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal - Pacific side"
-msgstr "imagico.de 授权绘制的OSM图像: 巴拿马运河-太平洋侧"
+msgid "imagico.de: Panama Canal - Pacific side"
+msgstr "imagico.de: 巴拿马运河-太平洋侧"
 
 msgid ""
 "New locks with less clouds than in the Sentinel-2 image - make sure to check "
 "image alignment (true color)"
 msgstr "新的水闸,较Sentinel-2图像中云量少 - 记得检查图像偏移(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Panama Canal"
-msgstr "imagico.de 授权绘制的OSM图像: 巴拿马运河"
+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"
-msgstr "imagico.de 授权绘制的OSM图像: 塔古拉岛"
+msgid "imagico.de: Vanatinai"
+msgstr "imagico.de: 塔古拉岛"
 
 msgid "Coarse coastline due to cloud cover in Bing/Mapbox (true color)"
 msgstr "Bing/Mapbox图像由于云层覆盖,海岸线较粗糙(真彩色)"
 
-msgid "imagico.de OSM images for mapping: New Ireland"
-msgstr "imagico.de 授权绘制的OSM图像: 新爱尔兰"
+msgid "imagico.de: New Ireland"
+msgstr "imagico.de: 新爱尔兰"
 
 msgid "Many missing islands in OSM (mostly mapped meanwhile) (true color)"
 msgstr "许多在OSM中遗漏的小岛(大部分已绘制)(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Coropuna"
-msgstr "imagico.de 授权绘制的OSM图像: 科罗普纳峰"
+msgid "imagico.de: Coropuna"
+msgstr "imagico.de: 科罗普纳峰"
 
-msgid ""
-"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
-msgstr "imagico.de 授权绘制的OSM图像: 韦尔卡努塔山脉和奎尔卡亚冰盖"
+msgid "imagico.de: Willkanuta Mountains and Quelccaya Ice Cap"
+msgstr "imagico.de: 韦尔卡努塔山脉和奎尔卡亚冰盖"
 
 msgid "Poor and outdated imagery in other sources (true color)"
 msgstr "其他来源的图像过时且质量较差(真彩色)"
@@ -25181,7 +25256,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"
@@ -25214,6 +25292,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 ""
 
@@ -25262,42 +25346,40 @@ msgstr "ScanEx IRS"
 msgid "ScanEx SPOT"
 msgstr "ScanEx SPOT"
 
-msgid "imagico.de OSM images for mapping: Kerch Strait"
-msgstr "imagico.de 授权绘制的OSM图像: 刻赤海峡"
+msgid "imagico.de: Kerch Strait"
+msgstr "imagico.de: 刻赤海峡"
 
 msgid "State of bridge construction in August 2016 (true color)"
 msgstr "2016年8月桥梁建设状况(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
-msgstr "imagico.de 授权绘制的OSM图像: 伯朝拉海海岸"
+msgid "imagico.de: Pechora Sea Coast"
+msgstr "imagico.de: 伯朝拉海海岸"
 
 msgid "Sentinel-2 image of the Pechora Sea coast in autumn 2016 (true color)"
 msgstr "Sentinel-2在2016年秋季拍摄的伯朝拉海沿岸图像(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Ushakov Island August 2016"
-msgstr "imagico.de 授权绘制的OSM图像: 乌沙科夫岛(2016年8月)"
+msgid "imagico.de: Ushakov Island August 2016"
+msgstr "imagico.de: 乌沙科夫岛(2016年8月)"
 
 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"
-msgstr "imagico.de 授权绘制的OSM图像: 北德维纳河三角洲(低潮)"
+msgid "imagico.de: Northern Dvina delta at low tide"
+msgstr "imagico.de: 北德维纳河三角洲(低潮)"
 
 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"
-msgstr "imagico.de 授权绘制的OSM图像: 北部和极地乌拉尔山脉(2016年8月)"
+msgid "imagico.de: Northern and Polar Ural mountains August 2016"
+msgstr "imagico.de: 北部和极地乌拉尔山脉(2016年8月)"
 
 msgid ""
 "Up-to-date late summer imagery with few clouds - caution: not all visible "
 "snow is glaciers (true color)"
 msgstr "夏季下旬的最新图像,有少许云层 - 警告:并非所有可见的雪都是冰川(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
-msgstr "imagico.de 授权绘制的OSM图像: 东方航天发射场"
+msgid "imagico.de: Vostochny Cosmodrome"
+msgstr "imagico.de: 东方航天发射场"
 
 msgid "Recent image showing newest features (true color)"
 msgstr "展现了最新特性的图像(真彩色)"
@@ -25342,26 +25424,26 @@ msgstr "仅可用于OpenStreetMap。开普敦城市都会区航拍图像。8厘
 msgid "South Africa CD:NGI Aerial"
 msgstr "南非 CD:NGI 航拍图像"
 
-msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
-msgstr "imagico.de 授权绘制的OSM图像: 列斯科夫岛(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"
-msgstr "imagico.de 授权绘制的OSM图像: 斯科特群岛"
+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"
-msgstr "imagico.de 授权绘制的OSM图像: 列斯科夫岛(Landsat)"
+msgid "imagico.de: Leskov Island Landsat"
+msgstr "imagico.de: 列斯科夫岛(Landsat)"
 
-msgid "imagico.de OSM images for mapping: Clerke Rocks"
-msgstr "imagico.de 授权绘制的OSM图像: 克拉克岩"
+msgid "imagico.de: Clerke Rocks"
+msgstr "imagico.de: 克拉克岩"
 
-msgid "imagico.de OSM images for mapping: Shag Rocks"
-msgstr "imagico.de 授权绘制的OSM图像: 沙格岩"
+msgid "imagico.de: Shag Rocks"
+msgstr "imagico.de: 沙格岩"
 
 msgid "Catastro Spain"
 msgstr "西班牙地籍"
@@ -25384,8 +25466,8 @@ msgstr "IDEIB - 巴利阿里群岛"
 msgid "GRAFCAN Express - Canary Islands"
 msgstr "GRAFCAN Express - 加那利群岛"
 
-msgid "imagico.de OSM images for mapping: Adams Bridge"
-msgstr "imagico.de 授权绘制的OSM图像: 亚当桥"
+msgid "imagico.de: Adams Bridge"
+msgstr "imagico.de: 亚当桥"
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr "补充其他图像来源中覆盖不完整的部分(真彩色)"
@@ -25480,14 +25562,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 授权绘制的OSM图像: 中央阿尔卑斯山脉(2016年9月)"
+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 "台湾电子地图开放数据"
 
@@ -25506,8 +25595,8 @@ msgstr "台湾地块数据"
 msgid "NLSC Open Data WMTS"
 msgstr "NLSC 开放数据 WMTS"
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
-msgstr "imagico.de 授权绘制的OSM图像: 乞力马扎罗山(2016年)"
+msgid "imagico.de: Mount Kilimanjaro 2016"
+msgstr "imagico.de: 乞力马扎罗山(2016年)"
 
 msgid "Aşgabat (high resolution)"
 msgstr "阿什哈巴德 (高分辨率)"
@@ -25569,22 +25658,22 @@ msgstr "该服务展现了从1995年至2013年从北卡罗来纳州收集的正
 msgid "U.S. Forest Service roads"
 msgstr "美国林业道路"
 
-msgid "imagico.de OSM images for mapping: Alaska Range"
-msgstr "imagico.de 授权绘制的OSM图像: 阿拉斯加山脉"
+msgid "imagico.de: Alaska Range"
+msgstr "imagico.de: 阿拉斯加山脉"
 
 msgid ""
 "Recent summer image of the Alaska Range for mapping natural features (true "
 "color)"
 msgstr "近期的阿拉斯加夏季图像,可用于绘制自然要素(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Bogoslof Island"
-msgstr "imagico.de 授权绘制的OSM图像: 博戈斯洛夫岛"
+msgid "imagico.de: Bogoslof Island"
+msgstr "imagico.de: 博戈斯洛夫岛"
 
 msgid "Recent image from after the eruption (true color)"
 msgstr "在火山喷发后的近期图像(真彩色)"
 
-msgid "imagico.de OSM images for mapping: Cook Inlet"
-msgstr "imagico.de 授权绘制的OSM图像: 库克湾"
+msgid "imagico.de: Cook Inlet"
+msgstr "imagico.de: 库克湾"
 
 msgid "Tidal flats and glaciers in surrounding mountains (true color)"
 msgstr "被山脉环绕的潮汐平原和冰川(真彩色)"
@@ -25670,16 +25759,23 @@ msgid ""
 "Castle, Kent and Sussex Counties in Delaware."
 msgstr "此数据包括了0.3米像素分辨率,4信道真彩色和近红外(R, G, B, IR)的图像。覆盖了德拉瓦州的纽卡斯尔,肯特和苏塞克斯。"
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains"
-msgstr "imagico.de 授权绘制的OSM图像: 鲁文佐里山脉"
+msgid "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 ""
 "Recent image of most of the remaining Rwenzori Mountains glaciers (false "
 "color IR)"
 msgstr "大部分剩余的鲁文佐里山脉冰川的近期图像(假色 IR)"
 
-msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
-msgstr "imagico.de 授权绘制的OSM图像: 鲁文佐里山脉(2016年)"
+msgid "imagico.de: Rwenzori Mountains 2016"
+msgstr "imagico.de: 鲁文佐里山脉(2016年)"
 
 msgid "Ukraine - Orthophotomaps 2012"
 msgstr "乌克兰 - 正射影像(2012年)"
@@ -25693,6 +25789,12 @@ msgstr "乌克兰 - 基辅 (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 ""
 
@@ -26145,7 +26247,7 @@ msgstr "OS 城市规划, Mayole (1856年-1857年)(NLS)"
 msgid ""
 "Detailed town plan of Mayole 1856-1857, courtesy of National Library of "
 "Scotland."
-msgstr ""
+msgstr "详细的 Mayole 城市规划(1856 年-1857 年),由苏格兰国家图书馆提供。"
 
 msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
 msgstr "OS Town Plans,蒙特罗斯(Montrose) 1861-1862 (NLS)"
@@ -26684,43 +26786,36 @@ msgstr ""
 msgid "{0} should have numbers only with optional .5 increments"
 msgstr "{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"
-msgstr "{0}:米为默认单位;若要多个单位,先空格再单位"
+"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"
-msgstr "{0}:吨为默认单位;逗号为分隔符;若要多个单位,先空格再单位"
+"unusual value of {0}: tonne is default; point is decimal separator; if "
+"units, put space then unit"
+msgstr ""
 
-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"
-msgstr "{0}:千米为默认单位;逗号为分隔符;若要多个单位,先空格再单位"
+"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 "电压应以伏特计量,不含有单位/分隔符/空格"
 
-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 "反常的坡度;使用百分比/度或上/下"
-
 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 "{0}必须为一数值,以米计量且无单位"
 
@@ -26827,6 +26922,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 "在高缩放显示街道标签"
 
@@ -26872,6 +26970,9 @@ msgstr ""
 "自动分配地址给一选定的在奥地利的对象. 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."
@@ -26907,6 +27008,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr "提供命令行让您创建自己的命令。请查阅链接以了解标准命令(arc、circle 等)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr "用于合并数据的工具(匹配混合)"
 
@@ -26954,6 +27058,11 @@ msgstr "显示 GPX 轨迹的海拔设定和一些统计数据。"
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "处理 French EPCIs (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "在 JOSM 使用扩展脚本"
 
@@ -27119,6 +27228,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr "允许打开与目前可视屏幕区域交集的 gpx/osm 文件"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr "启动 FireFox 将目前可见的画面显示为很好的 SVG 图片。"
@@ -27916,547 +28028,6 @@ msgstr "导入地理参照图像"
 msgid "Error while creating image layer: "
 msgstr "创建图像图层时发生错误: "
 
-msgid "Mapillary Images"
-msgstr "Mapillary Images"
-
-msgid "Mapillary layer"
-msgstr "Mapillary图层"
-
-msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
-msgstr "{0}序列,都包含在{1}和{2}间的图像 (ø {3})"
-
-msgid "{0} imported images"
-msgstr "{0}导入的图像"
-
-msgid "{0} downloaded images"
-msgstr "{0}下载的图像"
-
-msgid "{0} images in total"
-msgstr "总共{0}份图像"
-
-msgid "{0} images in {1} sequences"
-msgstr "{0}图像在{1}序列中"
-
-msgid "Mapillary object layer"
-msgstr "Mapillary对象层"
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr "显示Mapillary侦测到的地图对象"
-
-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 "{0}图像已提交,修改集合编号:{1},状态:{2}"
-
-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 "按\"{0}\"来下载图像"
-
-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 "停止步行"
-
-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 "您想将哪个图层导入Mapillary层?"
-
-msgid "Import"
-msgstr "输入"
-
-msgid "Could not import a geotagged image to the Mapillary layer!"
-msgstr "无法将地理标签图像导入Mapillary层!"
-
-msgid "{0} ({1} images)"
-msgstr "{0} ({1}份图像)"
-
-msgid ""
-"From which source do you want to import images to the Mapillary layer?"
-msgstr "您想从何来源导入图像至Mapillary层?"
-
-msgid "There are currently no layers with geotagged images!"
-msgstr "当前没有图层含有地理标签图像"
-
-msgid "Images from my file system"
-msgstr "我文件系统中的图像"
-
-msgid "Select the images you want to import"
-msgstr "选择您想要导入的图像"
-
-msgid "All images in a directory"
-msgstr "在某一目录下的所有图像"
-
-msgid "Select directory to import images from"
-msgstr "选择导入图像来源目录"
-
-msgid "From existing image layer"
-msgstr "从现有的图层中"
-
-msgid "Import exception"
-msgstr "导入发生意外"
-
-msgid "Could not import the image ''{0}''!"
-msgstr "无法导入图像''{0}''!"
-
-msgid "Could not import the directory ''{0}''!"
-msgstr "无法导入目录''{0}''!"
-
-msgid ""
-"A tag with key <i>{0}</i> is already present on the selected OSM object."
-msgstr "包含键 <i>{0}</i> 的标签已在所选OSM对象上出现。"
-
-msgid ""
-"Do you really want to replace the current value <i>{0}</i> with the new "
-"value <i>{1}</i>?"
-msgstr "您真的想要将当前值 <i>{0}</i> 替换为新值 <i>{1}</i>吗?"
-
-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 "Mapillary插件现在使用独立的面板来显示额外信息(比如图片键值)和已选的Mapillary图像的操作(就像在浏览器中那样)"
-
-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 "在当前选择的Mapillary图像上显示详细信息"
-
-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} 张图像"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "已导入 {0} 张图像"
-
-msgid "2 images joined"
-msgstr ""
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "已移动 {0} 张图像"
-
-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 "登录成功,返回 JOSM。"
-
-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 ""
 
@@ -29224,6 +28795,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 "替换节点 {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 ""
 
@@ -29257,9 +28926,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 "设定建筑物大小"
 
@@ -29272,8 +28962,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 "建筑物长度:"
@@ -29980,6 +29679,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 ""
 
@@ -30477,6 +30188,9 @@ msgstr "打开 GeoChat 面板"
 msgid "Zoom in to see messages"
 msgstr "放大查看消息"
 
+msgid "Login"
+msgstr "登录"
+
 msgid "Enable autologin"
 msgstr "启用自动登录"
 
@@ -30508,24 +30222,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 "只有位置"
 
@@ -30615,6 +30320,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 Blams"
 
@@ -31312,7 +31020,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"
@@ -31345,31 +31071,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 "Level Selection"
+msgid "Example: ''2'' or ''3''"
 msgstr ""
 
-msgid "Lowest Level"
+msgid "Indoor Mapping Helper"
 msgstr ""
 
-msgid "The lowest level of your building."
+msgid "Toolbox for indoor mapping assistance"
 msgstr ""
 
-msgid "Highest Level"
+msgid "Insert level"
 msgstr ""
 
-msgid "The highest level of your building."
+msgid "Add a new level to layer."
 msgstr ""
 
-msgid "Toolbox for indoor mapping assistance"
+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"
@@ -32448,6 +32235,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"
 
@@ -32781,6 +32589,9 @@ msgstr ""
 msgid "Please select an image first."
 msgstr ""
 
+msgid "No image selected"
+msgstr "未选择图像"
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33518,6 +33329,9 @@ msgstr ""
 msgid "State"
 msgstr "省/州"
 
+msgid "pending"
+msgstr "挂起中"
+
 msgid "[incomplete]"
 msgstr "[不完整]"
 
@@ -33930,12 +33744,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>"
@@ -34274,12 +34082,6 @@ msgstr "JOSM 标签编辑器插件"
 msgid "Presets"
 msgstr "预设组合(P)"
 
-msgid "Abort tag editing and close dialog"
-msgstr "放弃标签的编辑,并关闭此对话框"
-
-msgid "Apply edited tags and close dialog"
-msgstr "接受已编辑的标签,并关闭此对话框"
-
 msgid "Highlight"
 msgstr "突显"
 
@@ -35861,39 +35663,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 "替换节点 {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 ""
 
@@ -35967,9 +35736,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/zh_TW.po b/i18n/po/zh_TW.po
index 31860a2..8a18bac 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-31 03:42+0100\n"
+"POT-Creation-Date: 2018-01-28 23:36+0100\n"
 "PO-Revision-Date: 2017-10-12 17:07+0000\n"
 "Last-Translator: Supaplex <Unknown>\n"
 "Language-Team: Traditional Chinese\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-12-31 05:08+0000\n"
-"X-Generator: Launchpad (build 18521)\n"
+"X-Launchpad-Export-Date: 2018-01-29 05:09+0000\n"
+"X-Generator: Launchpad (build 18534)\n"
 "Language: zh_TW\n"
 
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -949,8 +949,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 "如果資料要下載到新的圖層裡請選擇此項"
@@ -2240,12 +2240,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"
@@ -8220,9 +8220,6 @@ msgstr "緯度的數值範圍必須為 [-90,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>"
@@ -9691,6 +9688,9 @@ msgstr "在「{0}」檔案中沒找到資料。"
 msgid "Open OSM file"
 msgstr "開啟 OSM 檔案"
 
+msgid "OSM Server Files XZ compressed"
+msgstr ""
+
 msgid "Validation Error Files"
 msgstr ""
 
@@ -12778,9 +12778,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 "自動確認所有遠端控制動作"
 
@@ -14476,6 +14473,10 @@ msgstr "保留外掛程式"
 msgid "Click to keep the plugin ''{0}''"
 msgstr "點選以保留外掛程式「{0}」"
 
+msgid ""
+"Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}"
+msgstr ""
+
 msgid "Failed to delete outdated plugin ''{0}''."
 msgstr "無法刪除過期的插件 ''{0}''。"
 
@@ -14485,10 +14486,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 ""
@@ -16324,10 +16321,6 @@ msgctxt "power"
 msgid "rooftop"
 msgstr ""
 
-msgctxt "power"
-msgid "kiosk"
-msgstr "販售站"
-
 msgid "Start date"
 msgstr "起始日期"
 
@@ -17813,6 +17806,9 @@ msgstr "生質柴油"
 msgid "Octane 80"
 msgstr "辛烷值 80"
 
+msgid "Octane 87"
+msgstr ""
+
 msgid "Octane 91"
 msgstr "辛烷值 91"
 
@@ -17834,6 +17830,9 @@ msgstr "E10 (10% 酒精)"
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% 酒精)"
 
+msgid "Ethanol (alcohol)"
+msgstr ""
+
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (液化石油氣)"
 
@@ -20487,6 +20486,12 @@ msgstr "噴泉"
 msgid "Water Well"
 msgstr "水井"
 
+msgid "Pump"
+msgstr ""
+
+msgid "powered"
+msgstr ""
+
 msgid "Lighthouse"
 msgstr "燈塔"
 
@@ -23558,6 +23563,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"
 
@@ -23639,7 +23671,7 @@ msgstr "OSM 檢驗工具:地址"
 msgid "OSM Inspector: Coastline (EU)"
 msgstr "OSM 檢驗工具:海岸線 (EU)"
 
-msgid "imagico.de OSM images for mapping: Prokletije Mountains"
+msgid "imagico.de: Prokletije Mountains"
 msgstr ""
 
 msgid ""
@@ -23654,7 +23686,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 ""
@@ -23662,21 +23694,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 ""
 
@@ -23815,13 +23869,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"
@@ -23854,14 +23908,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 ""
@@ -23927,7 +23981,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)"
@@ -24014,13 +24068,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)"
@@ -24188,34 +24242,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 ""
@@ -24223,7 +24276,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)"
@@ -24271,7 +24324,7 @@ msgstr ""
 msgid "Vejmidte"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: El Altar"
+msgid "imagico.de: El Altar"
 msgstr ""
 
 msgid ""
@@ -24279,7 +24332,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 ""
@@ -24448,8 +24501,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 ""
@@ -24457,9 +24509,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 ""
@@ -24467,10 +24517,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"
@@ -24503,57 +24553,52 @@ msgstr "德國美茵茲最新空照影像"
 msgid "Munich latest aerial imagery 60cm"
 msgstr "德國美茵茲最新空照影像 60cm"
 
-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 ""
@@ -24561,13 +24606,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 ""
@@ -24635,13 +24680,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 ""
@@ -24649,7 +24694,7 @@ msgid ""
 "(false color IR)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Sudirman Range 2015"
+msgid "imagico.de: Sudirman Range 2015"
 msgstr ""
 
 msgid ""
@@ -24657,7 +24702,7 @@ msgid ""
 "(true color)"
 msgstr ""
 
-msgid "imagico.de OSM images for mapping: Southeastern Sulawesi"
+msgid "imagico.de: Southeastern Sulawesi"
 msgstr ""
 
 msgid ""
@@ -24665,19 +24710,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 ""
@@ -24782,13 +24827,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 ""
@@ -24796,7 +24841,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)"
@@ -24890,13 +24935,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 ""
 
@@ -24984,6 +25022,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 ""
 
@@ -24992,6 +25044,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 ""
 
@@ -24999,13 +25075,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 ""
@@ -25019,7 +25095,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 ""
@@ -25027,29 +25103,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)"
@@ -25118,7 +25193,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"
@@ -25151,6 +25229,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 ""
 
@@ -25199,33 +25283,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 ""
@@ -25233,7 +25315,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)"
@@ -25279,25 +25361,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 ""
 
 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"
@@ -25321,7 +25403,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 ""
 
 msgid "Supplementing incomplete coverage in other sources (true color)"
@@ -25417,7 +25499,7 @@ msgstr ""
 msgid "Kanton Basel-Landschaft 10cm (2015)"
 msgstr "瑞士巴塞爾鄉村州 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 ""
 
 msgid ""
@@ -25425,6 +25507,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 "台灣通用電子地圖開放資料版"
 
@@ -25443,7 +25532,7 @@ msgstr "台灣國土利用調查成果圖"
 msgid "NLSC Open Data WMTS"
 msgstr "台灣國土測繪中心開放資料 WMTS"
 
-msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
+msgid "imagico.de: Mount Kilimanjaro 2016"
 msgstr ""
 
 msgid "Aşgabat (high resolution)"
@@ -25505,7 +25594,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 ""
@@ -25513,13 +25602,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)"
@@ -25606,7 +25695,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 ""
@@ -25614,7 +25710,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"
@@ -25629,6 +25725,12 @@ msgstr ""
 msgid "7th Series (OS7)"
 msgstr ""
 
+msgid "Hampshire Aerial FCIR"
+msgstr ""
+
+msgid "Hampshire Aerial RGB"
+msgstr ""
+
 msgid "OS New Popular Edition historic"
 msgstr ""
 
@@ -26620,32 +26722,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"
+"unusual value of {0}: meters is default; point is decimal separator; if "
+"units, put space then unit"
 msgstr ""
 
-msgid "unusual {0} format"
-msgstr "奇特的 {0} 格式"
-
 msgid ""
-"{0}: kilometers 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 "voltage should be in volts with no units/delimiter/spaces"
-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"
@@ -26654,9 +26752,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 ""
 
@@ -26763,6 +26858,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 ""
 
@@ -26806,6 +26904,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."
@@ -26839,6 +26940,9 @@ msgid ""
 "standard commands (arc, circle etc.)"
 msgstr "實作一個命令列讓你建立自己的指令。請查閱連結以了解標準指令 (arc, circle 等.)"
 
+msgid "..."
+msgstr ""
+
 msgid "Tool for conflating data (matching and merging)."
 msgstr ""
 
@@ -26886,6 +26990,11 @@ msgstr "顯示 GPX 軌跡的海拔設定檔和一些統計資料。"
 msgid "Handling of French EPCIs (boundary=local_authority)"
 msgstr "處理法國 EPCIs (boundary=local_authority)"
 
+msgid ""
+"Provides an event bus more powerful than the traditional listeners "
+"registration"
+msgstr ""
+
 msgid "Use external scripts in JOSM"
 msgstr "使用 JOSM 外部命令稿"
 
@@ -27053,6 +27162,9 @@ msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr "允許開啟與目前可視螢幕區域交集的 gpx/osm 檔案"
 
+msgid "Display OpenStreetMap object information"
+msgstr ""
+
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr "執行 FireFox 將目前可見的畫面顯示為很好的 SVG 圖片。"
@@ -27841,546 +27953,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 "Mapillary 物件圖層"
-
-msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr "顯示 Mapillary 偵測出來的地圖物件的圖層"
-
-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 ""
-
-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 "縮放到目前選取的 Mapiilary 影像"
-
-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 "Mapillary 歷史記錄"
-
-msgid "Open Mapillary history dialog"
-msgstr ""
-
-msgid "No image selected"
-msgstr "沒有選取圖片"
-
-msgid "Press \"{0}\" to download images"
-msgstr "按 \"{0}\" 下載影像"
-
-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 "使用 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} 個影像"
-
-msgid "Imported {0} image"
-msgid_plural "Imported {0} images"
-msgstr[0] "匯入了 {0} 個影像"
-
-msgid "2 images joined"
-msgstr "加入了 2 個影像"
-
-msgid "Moved {0} image"
-msgid_plural "Moved {0} images"
-msgstr[0] "移動了 {0} 個影像"
-
-msgid "Turned {0} image"
-msgid_plural "Turned {0} images"
-msgstr[0] "旋轉了 {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 ""
-
-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 "下載 Mapillary 影像"
-
-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 "上傳中:{0}"
-
 msgid "NanoLog"
 msgstr ""
 
@@ -29108,6 +28680,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 "加入太多路徑:{0}!"
+
+msgid "Knife tool"
+msgstr ""
+
+msgid "Split way."
+msgstr ""
+
+msgid "Split"
+msgstr ""
+
+msgid "Mode:KnifeTool"
+msgstr ""
+
 msgid "Building Generalization"
 msgstr ""
 
@@ -29141,9 +28811,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 "設定建築物大小"
 
@@ -29156,8 +28847,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 ""
@@ -29864,6 +29564,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 ""
 
@@ -30361,6 +30073,9 @@ msgstr "開啟 GeoChat 面板"
 msgid "Zoom in to see messages"
 msgstr "放大以觀看訊息"
 
+msgid "Login"
+msgstr "登入"
+
 msgid "Enable autologin"
 msgstr "啟用自動登入"
 
@@ -30392,24 +30107,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 "只有位置"
 
@@ -30499,6 +30205,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 Blams"
 
@@ -31196,8 +30905,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 ""
@@ -31229,33 +30956,94 @@ 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"
-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 "資訊模式"
 
@@ -32337,6 +32125,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"
 
@@ -32670,6 +32479,9 @@ msgstr "編輯照片 GPS 資料"
 msgid "Please select an image first."
 msgstr "請先選取一張影像。"
 
+msgid "No image selected"
+msgstr "沒有選取圖片"
+
 msgid "(Empty values delete the according fields.)"
 msgstr ""
 
@@ -33405,6 +33217,9 @@ msgstr ""
 msgid "State"
 msgstr "州"
 
+msgid "pending"
+msgstr ""
+
 msgid "[incomplete]"
 msgstr "[不完整]"
 
@@ -33815,12 +33630,6 @@ msgstr "{0} 的新數值"
 msgid "Preference ''{0}'' missing. Cannot initialize SdsApi."
 msgstr ""
 
-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>"
@@ -34157,12 +33966,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 "突顯"
 
@@ -35718,39 +35521,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 ""
 
@@ -35824,9 +35594,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/images/gps-lines.png b/images/gps-lines.png
deleted file mode 100644
index dc04d3e..0000000
Binary files a/images/gps-lines.png and /dev/null differ
diff --git a/images/layer-switcher-maximize.png b/images/layer-switcher-maximize.png
deleted file mode 100644
index b271024..0000000
Binary files a/images/layer-switcher-maximize.png and /dev/null differ
diff --git a/images/layer-switcher-minimize.png b/images/layer-switcher-minimize.png
deleted file mode 100644
index 551559d..0000000
Binary files a/images/layer-switcher-minimize.png and /dev/null differ
diff --git a/images/presets/craft/beekeeper.svg b/images/presets/craft/beekeeper.svg
index b63a59a..4ffec7b 100644
--- a/images/presets/craft/beekeeper.svg
+++ b/images/presets/craft/beekeeper.svg
@@ -11,12 +11,14 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg4260"
    sodipodi:modified="true"
-   sodipodi:docname="beekeeper.svg"
-   viewBox="0 0 245.05 243.85"
+   sodipodi:docname="33.svg"
+   viewBox="0 0 160 150"
    sodipodi:version="0.32"
    version="1.0"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.91 r13725">
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   width="160"
+   height="150">
   <defs
      id="defs27" />
   <sodipodi:namedview
@@ -25,13 +27,13 @@
      inkscape:pageshadow="2"
      inkscape:window-y="-8"
      pagecolor="#ffffff"
-     inkscape:window-height="988"
-     inkscape:zoom="1.4"
+     inkscape:window-height="987"
+     inkscape:zoom="2.8"
      inkscape:window-x="-8"
      borderopacity="1.0"
      inkscape:current-layer="layer1"
-     inkscape:cx="-121.68437"
-     inkscape:cy="197.21283"
+     inkscape:cx="72.969413"
+     inkscape:cy="86.177842"
      inkscape:window-width="1680"
      inkscape:pageopacity="0.0"
      inkscape:document-units="px"
@@ -45,119 +47,119 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     transform="translate(-46.226 -53.076)">
+     transform="translate(-46.226,-146.926)">
     <path
        inkscape:connector-curvature="0"
-       d="m 62.974818,221.03826 c -11.11578,-4.2753 -17.984762,30.49714 -11.11578,40.18782 25.153015,29.07204 81.729482,32.34977 81.729482,32.34977 l 62.37663,0.57004 c 0,0 64.84205,-0.99757 88.49871,-33.91738 5.41538,-6.69797 7.69554,-44.74814 -8.69311,-39.61778 -31.92224,24.65423 -51.87364,23.51415 -104.45983,24.65423 -52.58619,1.14008 -92.20397,-6.69797 -108.336102,-24.2267 z"
-       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       d="m 57.08992,250.17927 c -7.262321,-2.62809 -11.750065,18.74705 -7.262321,24.70406 16.433328,17.871 53.396691,19.88589 53.396691,19.88589 l 40.75278,0.35041 c 0,0 42.36355,-0.61322 57.81925,-20.84952 3.53805,-4.11734 5.02777,-27.50736 -5.67951,-24.35365 -20.8559,15.15533 -33.89082,14.4545 -68.24719,15.15533 -34.356367,0.70082 -60.240024,-4.11735 -70.7797,-14.89252 z"
+       style="fill:#d59d07;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.61251688"
        sodipodi:nodetypes="cccccczc"
        id="path5505" />
     <path
        inkscape:connector-curvature="0"
-       d="m 60.979678,250.1103 c -9.932947,-3.70526 -13.068167,5.98542 -7.011492,11.54331 23.898927,26.22184 78.537264,31.06718 78.537264,31.06718 l 64.02974,0.14251 c 0,0 67.69225,-2.13765 87.07361,-33.91738 3.99028,-4.98785 3.27773,-14.39351 -5.55789,-10.83076 -24.36921,22.51658 -53.29874,31.06718 -107.31003,31.3522 -53.99704,0.28502 -94.697895,-12.54088 -109.761202,-29.35706 z"
-       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       d="m 55.786424,268.05029 c -6.489535,-2.27768 -8.537882,3.67933 -4.580849,7.09583 15.613993,16.11897 51.311075,19.09748 51.311075,19.09748 l 41.83285,0.0875 c 0,0 44.22568,-1.31405 56.88818,-20.84952 2.60699,-3.06609 2.14146,-8.84789 -3.63117,-6.65784 -15.92123,13.84129 -34.82186,19.09747 -70.10933,19.27269 -35.27811,0.17521 -61.869378,-7.70907 -71.710756,-18.04624 z"
+       style="fill:#af7c05;fill-opacity:1;fill-rule:evenodd;stroke-width:0.63373041"
        sodipodi:nodetypes="cccccczc"
        id="path5507" />
     <path
        inkscape:connector-curvature="0"
-       d="m 75.430192,186.26582 c -9.932947,-3.70526 -16.716423,28.92953 -10.574242,37.48013 24.397712,21.3765 74.47573,22.37407 74.47573,22.37407 l 55.20837,0.42753 c 0,0 50.16352,4.98785 82.51329,-25.6518 4.84534,-5.84291 2.56518,-40.18782 -12.11335,-35.6275 -28.502,21.3765 -45.46069,21.3765 -92.34648,22.37407 -47.0283,0.99757 -82.755557,-6.12793 -97.163318,-21.3765 z"
-       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       d="m 65.227443,228.80413 c -6.489536,-2.27768 -10.921415,17.78342 -6.908516,23.0396 15.939864,13.14044 48.657563,13.75368 48.657563,13.75368 l 36.06952,0.2628 c 0,0 32.77354,3.06611 53.90878,-15.76853 3.16562,-3.59174 1.67589,-24.70405 -7.91407,-21.90077 -18.62135,13.14046 -29.70105,13.14046 -60.33315,13.75367 -30.725196,0.61323 -54.067041,-3.76693 -63.480127,-13.14045 z"
+       style="fill:#d59d07;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.61251688"
        sodipodi:nodetypes="cccccczc"
        id="path5509" />
     <path
        inkscape:connector-curvature="0"
-       d="m 85.106621,155.05613 c -8.849871,-3.27773 -13.552701,25.79431 -8.080317,33.34734 21.747026,19.09634 66.366906,19.9514 66.366906,19.9514 l 49.29421,0.42753 c 0,0 44.60563,4.41781 73.39265,-22.8016 4.2753,-5.27287 2.70769,-36.62507 -10.26072,-32.49228 -25.50929,19.09634 -41.47041,19.23885 -83.36835,19.9514 -41.81243,0.85506 -74.504228,-4.84534 -87.344379,-18.38379 z"
-       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       d="M 71.549386,209.61906 C 65.767462,207.60419 62.69494,225.47523 66.270238,230.11817 80.478317,241.85698 109.63,242.3826 109.63,242.3826 l 32.20563,0.26281 c 0,0 29.14239,2.71569 47.94992,-14.01649 2.79321,-3.24129 1.76903,-22.51399 -6.70369,-19.97349 -16.66608,11.73881 -27.09402,11.82641 -54.46738,12.26443 -27.31751,0.52562 -48.676183,-2.97851 -57.065094,-11.3008 z"
+       style="fill:#d59d07;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.61251688"
        sodipodi:nodetypes="cccccczc"
        id="path5511" />
     <path
        inkscape:connector-curvature="0"
-       d="m 95.951632,126.98166 c -8.009062,-3.13522 -14.621526,22.37407 -9.676429,29.07204 19.652127,17.24371 59.996707,18.09877 59.996707,18.09877 l 44.56288,0.28502 c 0,0 40.33033,3.99028 66.40966,-20.52144 3.84777,-4.84534 0.42753,-30.92467 -11.25829,-27.21941 -23.08662,17.24371 -35.6275,15.96112 -73.39265,16.81618 -37.90766,0.71255 -65.04156,-4.41781 -76.641878,-16.53116 z"
-       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       d="m 78.634806,192.36126 c -5.232596,-1.92726 -9.552747,13.75367 -6.321943,17.87102 12.839411,10.59997 39.197917,11.12559 39.197917,11.12559 l 29.11447,0.1752 c 0,0 26.34917,2.45289 43.3877,-12.61483 2.51387,-2.97851 0.27931,-19.00987 -7.35543,-16.73218 -15.08329,10.59995 -23.27667,9.81155 -47.94995,10.33715 -24.76638,0.43802 -42.493878,-2.71568 -50.072764,-10.16195 z"
+       style="fill:#d59d07;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.61251688"
        sodipodi:nodetypes="cccccczc"
        id="path5513" />
     <path
        inkscape:connector-curvature="0"
-       d="m 104.97251,101.47237 c -7.025738,-2.70769 -12.597879,20.66395 -8.251324,26.50686 17.272214,14.96355 52.714444,15.6761 52.714444,15.6761 l 39.119,0.28502 c 0,0 35.48499,3.42024 58.28659,-17.81375 3.42024,-4.13279 2.13765,-26.79188 -8.12307,-23.65666 -20.23642,14.96355 -32.06475,13.82347 -65.26958,14.53602 -33.27608,0.71255 -58.27234,-4.98785 -68.47605,-15.53359 z"
-       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       d="m 84.528456,176.68031 c -4.590159,-1.66446 -8.230628,12.70245 -5.390875,16.29417 11.284532,9.19832 34.440149,9.63635 34.440149,9.63635 l 25.55781,0.17518 c 0,0 23.18357,2.10247 38.08063,-10.95035 2.23457,-2.5405 1.3966,-16.46939 -5.30709,-14.54212 -13.22114,9.19832 -20.949,8.49749 -42.64288,8.93551 -21.74039,0.43802 -38.071303,-3.06611 -44.737737,-9.54874 z"
+       style="fill:#d59d07;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.61251688"
        sodipodi:nodetypes="cccccczc"
        id="path5515" />
     <path
        inkscape:connector-curvature="0"
-       d="m 114.0789,85.79627 c -6.19918,-1.99514 -11.75707,14.53602 -7.92355,18.95383 15.22007,10.97327 49.35121,11.97084 49.35121,11.97084 l 31.62297,0.28502 c 0,0 31.20969,2.13765 51.3036,-13.82347 2.99271,-2.99271 0,-20.23642 -9.12064,-17.95626 -17.81375,11.11578 -26.64937,11.11578 -56.00643,11.68582 -29.28581,0.42753 -50.23478,-3.27773 -59.22716,-11.11578 z"
-       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       d="m 90.477974,167.04399 c -4.050138,-1.22644 -7.6813,8.93552 -5.176727,11.65118 9.943795,6.74546 32.242843,7.35868 32.242843,7.35868 l 20.66036,0.1752 c 0,0 20.39037,1.31404 33.51842,-8.49749 1.95523,-1.83966 0,-12.43963 -5.95882,-11.03798 -11.63836,6.83302 -17.41095,6.83302 -36.59094,7.18344 -19.13343,0.26281 -32.820106,-2.01486 -38.695136,-6.83303 z"
+       style="fill:#d59d07;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.61251688"
        sodipodi:nodetypes="cccccczc"
        id="path5517" />
     <path
        inkscape:connector-curvature="0"
-       d="m 121.16165,71.83029 c -5.32987,-1.4251 -8.92113,12.68339 -5.62914,15.96112 13.05391,8.26558 39.86004,8.69311 39.86004,8.69311 l 29.59933,0.14251 c 0,0 26.79188,1.85263 44.1781,-9.9757 2.56518,-2.28016 0.57004,-16.67367 -7.26801,-14.96355 -15.24857,8.26558 -23.51415,9.83319 -48.73842,10.26072 -25.13876,0.28502 -44.29211,-4.2753 -52.0019,-10.11821 z"
-       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       d="m 95.105377,158.45888 c -3.482188,-0.87602 -5.828481,7.79668 -3.67771,9.81154 8.528571,5.08099 26.041953,5.3438 26.041953,5.3438 l 19.33824,0.0875 c 0,0 17.50407,1.13884 28.86306,-6.13222 1.67593,-1.40164 0.37244,-10.24954 -4.74842,-9.19831 -9.96242,5.08096 -15.36262,6.0446 -31.8425,6.30741 -16.42401,0.17522 -28.93755,-2.62808 -33.974623,-6.21981 z"
+       style="fill:#d59d07;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.61251688"
        sodipodi:nodetypes="cccccczc"
        id="path5519" />
     <path
        inkscape:connector-curvature="0"
-       d="m 126.60553,62.28212 c -4.68858,-1.28259 -7.42477,9.40566 -4.53182,12.11335 11.50056,6.98299 35.10022,7.41052 35.10022,7.41052 l 25.96532,0.14251 c 0,0 23.65666,1.56761 38.90523,-8.40809 2.28016,-1.99514 1.4251,-12.54088 -5.41538,-11.11578 -13.53845,7.1255 -21.23399,-6.69797 -43.32304,-6.41295 -22.14605,0.28502 -39.91705,11.11578 -46.70053,6.27044 z"
-       style="fill:#d59d07;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988;fill-opacity:1"
+       d="m 98.662051,152.58947 c -3.06321,-0.78841 -4.850857,5.78182 -2.960792,7.44629 7.513691,4.29255 22.932171,4.55535 22.932171,4.55535 l 16.96404,0.0875 c 0,0 15.45571,0.96365 25.41813,-5.16856 1.48972,-1.22646 0.93106,-7.70907 -3.53805,-6.83305 -8.84514,4.38016 -13.87291,-4.11734 -28.30444,-3.94213 -14.46877,0.17521 -26.07918,6.83304 -30.511059,3.85451 z"
+       style="fill:#d59d07;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.61251688"
        sodipodi:nodetypes="cccccczc"
        id="path5521" />
     <path
        inkscape:connector-curvature="0"
-       d="m 145.20309,69.69264 c 4.83109,3.42024 43.06652,5.27287 50.33453,-0.42753"
-       style="fill:none;stroke:#000000;stroke-width:5.70039988"
+       d="m 110.81247,157.14484 c 3.15631,2.10248 28.13684,3.24131 32.88528,-0.26279"
+       style="fill:none;stroke:#000000;stroke-width:3.61251688"
        sodipodi:nodetypes="cc"
        id="path5523" />
     <path
        inkscape:connector-curvature="0"
-       d="m 145.16033,293.71836 c 0.45604,-27.64694 11.24404,-34.34491 22.58784,-34.48742 11.4008,-0.14251 23.37164,7.41052 22.94411,33.91738 l -45.53195,0.57004 z"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:5.70039988"
+       d="m 110.78454,294.85682 c 0.29794,-16.99497 7.34612,-21.11234 14.75741,-21.19993 7.44852,-0.0875 15.26949,4.55535 14.99017,20.84952 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:3.61251688"
        sodipodi:nodetypes="czcc"
        id="path5525" />
     <path
        inkscape:connector-curvature="0"
-       d="m 73.078777,216.62045 c -8.992381,-2.56518 -11.82833,4.13279 -6.341695,7.83805 21.633018,17.95626 71.112488,21.23399 71.112488,21.23399 l 57.97307,0.14251 c 0,0 49.59348,2.42267 78.80803,-23.08662 3.56275,-3.42024 2.99271,-9.9757 -4.98785,-7.55303 -22.08905,15.39108 -48.31089,21.23399 -97.19182,21.51901 -48.88093,0.14251 -85.719765,-8.5506 -99.372223,-20.09391 z"
-       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       d="m 63.691183,247.46358 c -5.875033,-1.57687 -7.727856,2.54048 -4.143247,4.81817 14.133594,11.03798 46.460214,13.05284 46.460214,13.05284 l 37.87581,0.0875 c 0,0 32.40115,1.48924 51.488,-14.19171 2.32766,-2.10247 1.95523,-6.1322 -3.25873,-4.64295 -14.43153,9.46111 -31.56315,13.05287 -63.49875,13.22806 -31.935599,0.0875 -56.003676,-5.25619 -64.923297,-12.35202 z"
+       style="fill:#af7c05;fill-opacity:1;fill-rule:evenodd;stroke-width:0.63373041"
        sodipodi:nodetypes="cccccczc"
        id="path5527" />
     <path
        inkscape:connector-curvature="0"
-       d="m 87.272773,184.69821 c -7.724042,-1.99514 -10.175214,3.27773 -5.458133,6.27044 18.59755,13.96598 61.09404,16.53116 61.09404,16.53116 l 49.77874,0.14251 c 0,0 42.61049,1.85263 67.69225,-18.09877 3.13522,-2.70769 2.70769,-7.69554 -4.2753,-5.84291 -18.95383,11.97084 -41.47041,16.53116 -83.51086,16.67367 -41.95494,0.28502 -73.592164,-6.55546 -85.320737,-15.6761 z"
-       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       d="m 72.96461,227.84051 c -5.046384,-1.22645 -6.647819,2.01486 -3.565988,3.85453 12.150418,8.58509 39.914828,10.16194 39.914828,10.16194 l 32.52218,0.0875 c 0,0 27.83888,1.13884 44.22567,-11.12559 2.04832,-1.66444 1.76902,-4.73055 -2.79322,-3.5917 -12.38316,7.35864 -27.09403,10.16195 -54.56051,10.24954 -27.4106,0.1752 -48.080284,-4.02973 -55.74296,-9.63632 z"
+       style="fill:#af7c05;fill-opacity:1;fill-rule:evenodd;stroke-width:0.63373041"
        sodipodi:nodetypes="cccccczc"
        id="path5529" />
     <path
        inkscape:connector-curvature="0"
-       d="m 94.341269,151.7784 c -7.068496,-1.85263 -9.305903,3.13522 -4.98785,5.98542 17.015691,13.39594 55.920921,15.96112 55.920921,15.96112 l 45.56045,0 c 0,0 39.04774,1.85263 61.99185,-17.38622 2.8502,-2.56518 2.42267,-7.41052 -3.99028,-5.55789 -17.24371,11.54331 -37.90766,15.96112 -76.38536,16.10363 -38.40644,0.14251 -67.37873,-6.41295 -78.109731,-15.10606 z"
-       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       d="m 77.5827,207.60419 c -4.61809,-1.13885 -6.079866,1.92727 -3.258734,3.67933 11.116937,8.23469 36.535044,9.81153 36.535044,9.81153 h 29.76624 c 0,0 25.51121,1.13886 40.50141,-10.68756 1.86213,-1.57686 1.5828,-4.55537 -2.60698,-3.41652 -11.26594,7.09585 -24.76642,9.81153 -49.9052,9.89914 -25.09228,0.0875 -44.020847,-3.94214 -51.03178,-9.28592 z"
+       style="fill:#af7c05;fill-opacity:1;fill-rule:evenodd;stroke-width:0.63373041"
        sodipodi:nodetypes="cccccczc"
        id="path5531" />
     <path
        inkscape:connector-curvature="0"
-       d="m 104.31697,123.98895 c -6.184935,-1.56761 -8.123071,2.70769 -4.360807,5.13036 14.849537,11.54331 48.809677,13.68096 48.809677,13.68096 l 39.78879,0 c 0,0 34.05989,1.56761 54.01129,-14.82104 2.56518,-2.28016 2.13765,-6.41295 -3.42024,-4.84534 -15.10606,9.83319 -33.06232,13.68096 -66.55217,13.82347 -33.63236,0.14251 -58.91363,-5.55789 -68.27654,-12.96841 z"
-       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       d="m 84.100169,190.52161 c -4.040831,-0.96365 -5.307082,1.66445 -2.849067,3.15371 9.701714,7.09584 31.889018,8.40988 31.889018,8.40988 h 25.99542 c 0,0 22.25248,0.96363 35.28743,-9.11072 1.67592,-1.40163 1.39658,-3.94214 -2.23456,-2.9785 -9.8693,6.04461 -21.60076,8.4099 -43.48084,8.49749 -21.97315,0.0875 -38.490289,-3.41652 -44.607401,-7.97186 z"
+       style="fill:#af7c05;fill-opacity:1;fill-rule:evenodd;stroke-width:0.63373041"
        sodipodi:nodetypes="cccccczc"
        id="path5533" />
     <path
        inkscape:connector-curvature="0"
-       d="m 111.91275,99.76225 c -5.55789,-1.56761 -7.32501,2.42267 -3.91902,4.56032 13.36743,10.40323 43.95008,12.25586 43.95008,12.25586 l 35.89827,0.14251 c 0,0 30.63965,1.4251 48.59591,-13.39594 2.28016,-1.99514 1.99514,-5.84291 -2.99271,-4.41781 -13.68096,8.97813 -29.78459,12.39837 -60.13922,12.39837 -30.18362,0.14251 -52.95672,-4.84534 -61.39331,-11.54331 z"
-       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       d="m 89.062752,175.62908 c -3.631158,-0.96361 -4.785681,1.48926 -2.56043,2.80329 8.733402,6.39504 28.714118,7.53388 28.714118,7.53388 l 23.45355,0.0875 c 0,0 20.01795,0.87602 31.74938,-8.23469 1.48971,-1.22645 1.3035,-3.59174 -1.95523,-2.7157 -8.93825,5.51898 -19.4593,7.62146 -39.29103,7.62146 -19.72,0.0875 -34.598443,-2.9785 -40.110358,-7.09585 z"
+       style="fill:#af7c05;fill-opacity:1;fill-rule:evenodd;stroke-width:0.63373041"
        sodipodi:nodetypes="cccccczc"
        id="path5535" />
     <path
        inkscape:connector-curvature="0"
-       d="m 120.30659,84.37117 c -4.78834,-0.99757 -5.32987,1.71012 -2.40842,3.27773 11.51481,7.41052 37.82216,7.69554 37.82216,7.69554 l 30.83916,0.14251 c 0,0 26.36435,0.85506 41.89794,-9.54817 1.99514,-1.4251 1.56761,-3.99028 -2.70769,-2.99271 -11.68582,6.27044 -25.6518,8.69311 -51.58862,8.69311 -26.03658,0.14251 -46.60077,-2.56518 -53.85453,-7.26801 z"
-       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       d="m 94.546737,166.16796 c -3.128387,-0.61323 -3.482189,1.05123 -1.573504,2.01488 7.523027,4.55535 24.710517,4.73054 24.710517,4.73054 l 20.14828,0.0875 c 0,0 17.22474,0.52561 27.37339,-5.8694 1.30348,-0.87604 1.02416,-2.4529 -1.76903,-1.83967 -7.63476,3.85452 -16.75921,5.3438 -33.70465,5.3438 -17.01058,0.0875 -30.445872,-1.57687 -35.185003,-4.46777 z"
+       style="fill:#af7c05;fill-opacity:1;fill-rule:evenodd;stroke-width:0.63373041"
        sodipodi:nodetypes="cccccczc"
        id="path5537" />
     <path
        inkscape:connector-curvature="0"
-       d="m 125.99274,71.9728 c -4.20405,-0.85506 -4.67433,1.4251 -2.10915,2.70769 10.07546,5.84291 33.13358,6.27044 33.13358,6.27044 l 27.11965,0 c 0,0 23.08662,0.71255 36.62507,-7.69554 1.71012,-1.14008 1.4251,-3.27773 -2.28016,-2.56518 -10.26072,5.13036 -22.51658,7.1255 -45.31818,7.1255 -22.8016,0.14251 -40.81486,-1.99514 -47.17081,-5.84291 z"
-       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       d="m 98.261695,158.54649 c -2.746651,-0.52561 -3.0539,0.87603 -1.377982,1.66445 6.582627,3.59174 21.647297,3.85454 21.647297,3.85454 h 17.7182 c 0,0 15.08328,0.43803 23.92843,-4.73056 1.11727,-0.70082 0.93106,-2.01486 -1.4897,-1.57687 -6.70371,3.15371 -14.71087,4.38017 -29.60794,4.38017 -14.89708,0.0875 -26.66577,-1.22646 -30.818305,-3.59173 z"
+       style="fill:#af7c05;fill-opacity:1;fill-rule:evenodd;stroke-width:0.63373041"
        sodipodi:nodetypes="cccccczc"
        id="path5539" />
     <path
        inkscape:connector-curvature="0"
-       d="m 147.469,67.98252 c -2.02365,0.28502 -1.78138,1.14008 -0.51304,1.71012 4.90234,1.85263 16.08938,2.28016 16.08938,2.28016 l 13.53845,0 c 0,0 11.11578,1.14008 17.81375,-2.99271 0.85506,-0.57004 0.28502,-1.14008 -0.71255,-1.56761 -6.55546,-0.57004 -10.83076,-2.70769 -22.23156,-2.70769 -11.4008,0.14251 -20.89197,3.27773 -23.98443,3.27773 z"
-       style="fill:#af7c05;fill-rule:evenodd;fill-opacity:1"
+       d="m 112.29287,156.09361 c -1.32211,0.1752 -1.16384,0.70082 -0.33519,1.05123 3.20287,1.13884 10.51174,1.40165 10.51174,1.40165 h 8.84515 c 0,0 7.26232,0.70083 11.63832,-1.83967 0.55864,-0.3504 0.18623,-0.70082 -0.46553,-0.96364 -4.28291,-0.3504 -7.07612,-1.66446 -14.52465,-1.66446 -7.44852,0.0875 -13.64944,2.01489 -15.66984,2.01489 z"
+       style="fill:#af7c05;fill-opacity:1;fill-rule:evenodd;stroke-width:0.63373041"
        sodipodi:nodetypes="cccccczc"
        id="path5541" />
   </g>
@@ -169,7 +171,7 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
         <dc:publisher>
           <cc:Agent
              rdf:about="http://openclipart.org/">
@@ -198,7 +200,7 @@
         </dc:subject>
       </cc:Work>
       <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
            rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
diff --git a/images/presets/craft/painter.svg b/images/presets/craft/painter.svg
index 15d1fa1..13dc224 100644
--- a/images/presets/craft/painter.svg
+++ b/images/presets/craft/painter.svg
@@ -1,124 +1,481 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns1="http://sozi.baierouge.fr" sodipod [...]
-  <sodipodi:namedview bordercolor="#666666" inkscape:pageshadow="2" inkscape:window-y="-4" fit-margin-left="0" pagecolor="#ffffff" inkscape:zoom="1.8552865" inkscape:window-maximized="1" inkscape:window-x="-4" showgrid="false" borderopacity="1.0" inkscape:current-layer="layer1" inkscape:cx="55.731088" inkscape:cy="61.76978" inkscape:pageopacity="0.0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-height="975" fit-margin-top="0" inkscape:window-width="1280" inkscape:document-u [...]
-  <defs>
-    <filter id="filter5851" width="1.2739" y="-0.97" x="-.13694" height="2.94" color-interpolation-filters="sRGB" inkscape:collect="always">
-      <feGaussianBlur stdDeviation="4.1776055" inkscape:collect="always"/>
-    </filter>
-    <filter id="filter5889" inkscape:collect="always" color-interpolation-filters="sRGB">
-      <feGaussianBlur stdDeviation="3.2650212" inkscape:collect="always"/>
-    </filter>
-    <filter id="filter18598" width="3.2246" y="-.077583" x="-1.1123" height="1.1552" color-interpolation-filters="sRGB" inkscape:collect="always">
-      <feGaussianBlur stdDeviation="4.1044441" inkscape:collect="always"/>
-    </filter>
-    <filter id="filter18634" width="1.4681" y="-.010848" x="-.23407" height="1.0217" color-interpolation-filters="sRGB" inkscape:collect="always">
-      <feGaussianBlur stdDeviation="1.037628" inkscape:collect="always"/>
-    </filter>
-    <filter id="filter18638" width="1.2582" y="-.010647" x="-.12909" height="1.0213" color-interpolation-filters="sRGB" inkscape:collect="always">
-      <feGaussianBlur stdDeviation="1.037628" inkscape:collect="always"/>
-    </filter>
-    <filter id="filter18646" width="1.6075" y="-.032683" x="-.30377" height="1.0654" color-interpolation-filters="sRGB" inkscape:collect="always">
-      <feGaussianBlur stdDeviation="2.1645993" inkscape:collect="always"/>
-    </filter>
-    <filter id="filter18650" width="1.7653" y="-.023490" x="-.38265" height="1.047" color-interpolation-filters="sRGB" inkscape:collect="always">
-      <feGaussianBlur stdDeviation="2.670959" inkscape:collect="always"/>
-    </filter>
-    <filter id="filter18654" width="1.494" y="-.018502" x="-.24702" height="1.037" color-interpolation-filters="sRGB" inkscape:collect="always">
-      <feGaussianBlur stdDeviation="2.829191" inkscape:collect="always"/>
-    </filter>
-    <filter id="filter18670" width="2.2071" y="-.12820" x="-.60354" height="1.2564" color-interpolation-filters="sRGB" inkscape:collect="always">
-      <feGaussianBlur stdDeviation="2.8678247" inkscape:collect="always"/>
-    </filter>
-    <filter id="filter25984" width="1.1176" y="-.17903" x="-0.0588" height="1.3581" color-interpolation-filters="sRGB" inkscape:collect="always">
-      <feGaussianBlur stdDeviation="19.043014" inkscape:collect="always"/>
-    </filter>
-    <filter id="filter26000" inkscape:collect="always" color-interpolation-filters="sRGB">
-      <feGaussianBlur stdDeviation="12.322873" inkscape:collect="always"/>
-    </filter>
-    <filter id="filter26008" width="1.7708" y="-.11910" x="-.38538" height="1.2382" color-interpolation-filters="sRGB" inkscape:collect="always">
-      <feGaussianBlur stdDeviation="23.090638" inkscape:collect="always"/>
-    </filter>
-    <linearGradient id="linearGradient48025" x1="-61.35" gradientUnits="userSpaceOnUse" y1="463.91" gradientTransform="matrix(.18935 0 0 .18935 97.271 861.77)" x2="82.448" y2="463.91" inkscape:collect="always">
-      <stop stop-color="#ffbd55" offset="0"/>
-      <stop stop-color="#cd7b44" offset=".3"/>
-      <stop stop-color="#d19829" offset=".54966"/>
-      <stop offset=".79931"/>
-      <stop stop-color="#ffc155" offset="1"/>
-    </linearGradient>
-    <linearGradient id="linearGradient50451" x1="-49.422" gradientUnits="userSpaceOnUse" y1="451.99" gradientTransform="matrix(.18935 0 0 .18935 97.271 861.77)" x2="69.258" y2="451.99" inkscape:collect="always">
-      <stop stop-color="#2c2f33" offset="0"/>
-      <stop stop-color="#959799" offset=".024"/>
-      <stop stop-color="#FFF" offset=".048"/>
-      <stop stop-color="#2d2d2d" offset=".11406"/>
-      <stop stop-color="#adadae" offset=".21069"/>
-      <stop stop-color="#898989" offset=".28078"/>
-      <stop stop-color="#FFF" offset=".40167"/>
-      <stop stop-color="#FFF" offset=".64231"/>
-      <stop offset=".86118"/>
-      <stop stop-color="#FFF" offset=".94329"/>
-      <stop offset="1"/>
-    </linearGradient>
-    <linearGradient id="linearGradient52877" x1="63.104" gradientUnits="userSpaceOnUse" y1="-276.88" gradientTransform="matrix(.18935 0 0 .18935 97.271 861.77)" x2="63.104" y2="-25.189" inkscape:collect="always">
-      <stop stop-color="#FFF" offset="0"/>
-      <stop stop-color="#f8f8d5" offset=".15"/>
-      <stop stop-color="#a29e89" offset=".57519"/>
-      <stop stop-color="#bfb69a" offset=".80602"/>
-      <stop stop-color="#eeeebe" offset=".91598"/>
-      <stop stop-color="#FFF" offset="1"/>
-    </linearGradient>
-  </defs>
-  <g inkscape:label="Layer 1" transform="translate(-19.691 -808.97)" inkscape:groupmode="layer">
-    <rect ry="93.403" style="color:#000000" rx="49.098" transform="matrix(.17242 0 0 .15824 23.609 822.04)" height="255.29" filter="url(#filter25984)" width="777.27" y="-7.7351" x="34.588" fill="#b3b3b3"/>
-    <path style="color:#000000" d="m426.17 456.7h119.33c19.45 154.41 14.645 302.88 0.2703 457.3-41.636 12.659-79.246 8.247-118.79 0.8111-13.975-154.41-18.601-303.69-0.81106-458.11z" sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" transform="matrix(.13716 0 0 .19922 36.799 809.84)" filter="url(#filter26008)" fill="#666"/>
-    <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m99.764 134.92c-28.563 0-49.656 26.332-49.656 56.062v106.12c0 29.731 21.093 56.031 49.656 56.031h301.5c23.058 0 36.233 4.7943 43.5 11.5 7.2667 6.7058 10.969 16.889 10.969 34l0.062 61.625 27-0.031-0.062-61.594v-0.031c-0.01-21.347-5.3933-40.651-19.656-53.812-14.27-13.168-35.049-18.656-61.812-18.656h-301.5c-11.522 0-22.656-11.623-22.656-29.031v-106.12c0-17.408 11.135-29.062 22.656-29.062h423.16v-27h-42 [...]
-    <rect style="color:#000000" ry="3.8152" height="107.32" width="22.508" y="893.7" x="87.975" fill="url(#linearGradient50451)"/>
-    <path style="color:#000000" d="m45.652 180.66c0 2.8543-14.698-5.7295-34.916-5.7295-32.567 0-34.745 25.455-41.006 25.19-2.4241-0.10284-0.86439-38.25 40.837-35.137 20.207 1.5088 35.085 4.6491 35.085 15.677z" sodipodi:nodetypes="sssss" inkscape:connector-curvature="0" transform="matrix(.24837 0 0 .12241 97.021 875.06)" filter="url(#filter5851)" fill="#FFF"/>
-    <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" inkscape:connector-curvature="0" d="m29.093 832.1c-5.4084 0-9.4024 4.9859-9.4024 10.615v20.095c0 5.6295 3.994 10.61 9.4024 10.61h57.089c4.3661 0 6.8608 0.90779 8.2367 2.1775s2.0769 3.198 2.0769 6.4379l0.01183 11.669 5.1124-0.006-0.0118-11.663v-0.006c-0.00094-4.0421-1.0212-7.6972-3.7219-10.189-2.702-2.4934-6.6365-3.5326-11.704-3.5326h-57.089c-2.1816 0-4.29-2.2008-4.29-5.4971v-20.095c0-3.2963 2.1084-5.50 [...]
-    <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m781.7 97.401c-237.4 0.23749-474.84-0.16911-712.25 0.21875-23.369 2.2736-39.727 26.327-38.076 48.969-0.39642 37.585-0.51427 75.224 0.23226 112.78 2.4929 21.387 20.996 41.917 43.531 40.356 95.285 0.20258 190.59-0.58711 285.88 0.27198 18.99 0.3521 39.64-1.8231 56.375 9.0591 12.329 6.8164 17.719 20.963 18.872 34.336 1.1809 23.642 0.44642 54.32 1.0966 75.992l10.719 0.0489-0.79265-74.183c-0.0783-7.3321-1 [...]
-    <rect style="color:#000000" rx="9.2966" ry="17.686" height="48.339" width="147.18" y="809.15" x="22.512" fill="url(#linearGradient52877)"/>
-    <path style="color:#000000" inkscape:connector-curvature="0" fill="url(#linearGradient48025)" d="m87.85 905.56h22.595c3.6828 29.238 2.773 57.351 0.0512 86.589-7.8837 2.397-15.005 1.5616-22.493 0.15358-2.6462-29.238-3.5222-57.505-0.15357-86.742z" sodipodi:nodetypes="ccccc"/>
-    <path style="color:#000000" d="m439.17 487.01h7.1576c-8.4859 8.9501-6.5044 32.321-9.7148 53.689-1.3723-17.915-3.9847-36.366 2.5572-53.689z" sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" transform="matrix(.18935 0 0 .18935 15.963 814.34)" filter="url(#filter18670)" fill="#FC0"/>
-    <path opacity=".81667" style="color:#000000" d="m393.6 482.68h12.108c-3.345 26.498-8.8476 95.689-16.433 158.95-1.9116-52.984 0.50524-105.97 4.3257-158.95z" sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" transform="matrix(.18935 0 0 .18935 15.963 814.34)" filter="url(#filter18646)" fill="#c87137"/>
-    <path style="color:#000000" d="m434.22 946.74h12.108c-14.354-38.99-11.003-140.8-16.433-233.89-2.3214 78.047-6.7404 158.42 4.3257 233.89z" sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" transform="matrix(.18935 0 0 .18935 15.963 814.34)" filter="url(#filter18638)" fill="#c87137"/>
-    <path opacity=".55833" style="color:#000000" d="m480.24 487.27h-12.108c15.983 38.861 24.555 220.56 15.352 366.98 19.755-137.83 13.012-286.47-3.2443-366.98z" sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" transform="matrix(.18935 0 0 .18935 15.963 814.34)" filter="url(#filter18654)" fill="#c87137"/>
-    <path opacity=".52083" style="color:#000000" d="m439.65 946.74h6.6776c-7.9169-38.269-6.0683-138.2-9.0634-229.56-1.2803 76.603-3.7175 155.49 2.3857 229.56z" sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" transform="matrix(.18935 0 0 .18935 15.963 814.34)" filter="url(#filter18634)" fill="#FC0"/>
-    <path style="color:#000000" d="m472.39 487.27h-5.3392c7.0482 29.242 17.317 162.72 13.258 272.9 8.7116-103.71-0.75019-212.32-7.9192-272.9z" sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" transform="matrix(.18935 0 0 .18935 15.963 814.34)" filter="url(#filter18650)" fill="#FC0"/>
-    <path style="color:#000000" d="m42.898 176.9c0 2.8543-20.207-4.4749-40.425-4.4749-20.277 0-38.737 9.4161-44.608 5.1158-2.4241-1.7756 2.5119-14.411 44.227-12.136 19.995 1.0906 40.806 0.46705 40.806 11.495z" sodipodi:nodetypes="sssss" inkscape:connector-curvature="0" transform="matrix(-.24160 0 0 -.12241 99.635 926.96)" filter="url(#filter5851)"/>
-    <path style="color:#000000" d="m-37.824 392.25h7.1576c-8.4859 21.029-6.5044 75.939-9.7148 126.14-1.3723-42.093-3.9847-85.442 2.5572-126.14z" sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" transform="matrix(.30296 .017635 .016139 -.33104 95.709 1099.5)" filter="url(#filter18598)" fill="#FC0"/>
-  </g>
-  <metadata>
-    <rdf:RDF>
-      <cc:Work>
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <cc:license rdf:resource="http://creativecommons.org/licenses/publicdomain/"/>
-        <dc:publisher>
-          <cc:Agent rdf:about="http://openclipart.org/">
-            <dc:title>Openclipart</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:title>Paint Rollers</dc:title>
-        <dc:date>2011-06-06T12:56:53</dc:date>
-        <dc:description/>
-        <dc:source>https://openclipart.org/detail/142777/paint-rollers-by-maxim2</dc:source>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>maxim2</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>Paint Rollers</rdf:li>
-            <rdf:li>tool</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
-        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
-        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="05.svg"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   viewBox="0 0 12 16"
+   id="svg127"
+   width="12"
+   height="16">
+  <sodipodi:namedview
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="-8"
+     fit-margin-left="0"
+     pagecolor="#ffffff"
+     inkscape:zoom="47.703922"
+     inkscape:window-maximized="1"
+     inkscape:window-x="-8"
+     showgrid="false"
+     borderopacity="1.0"
+     inkscape:current-layer="g123"
+     inkscape:cx="5.8309847"
+     inkscape:cy="7.8790063"
+     inkscape:pageopacity="0.0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-height="987"
+     fit-margin-top="0"
+     inkscape:window-width="1680"
+     inkscape:document-units="px"
+     id="namedview2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid878" />
+  </sodipodi:namedview>
+  <defs
+     id="defs87">
+    <filter
+       id="filter5851"
+       width="1.2739"
+       y="-0.97000003"
+       x="-0.13694"
+       height="2.9400001"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="4.1776055"
+         inkscape:collect="always"
+         id="feGaussianBlur4" />
+    </filter>
+    <filter
+       id="filter5889"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="3.2650212"
+         inkscape:collect="always"
+         id="feGaussianBlur7" />
+    </filter>
+    <filter
+       id="filter18598"
+       width="3.2246001"
+       y="-0.077583"
+       x="-1.1123"
+       height="1.1552"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="4.1044441"
+         inkscape:collect="always"
+         id="feGaussianBlur10" />
+    </filter>
+    <filter
+       id="filter18634"
+       width="1.4681"
+       y="-0.010848"
+       x="-0.23407"
+       height="1.0217"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="1.037628"
+         inkscape:collect="always"
+         id="feGaussianBlur13" />
+    </filter>
+    <filter
+       id="filter18638"
+       width="1.2582"
+       y="-0.010647"
+       x="-0.12909"
+       height="1.0213"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="1.037628"
+         inkscape:collect="always"
+         id="feGaussianBlur16" />
+    </filter>
+    <filter
+       id="filter18646"
+       width="1.6075"
+       y="-0.032683"
+       x="-0.30377001"
+       height="1.0654"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="2.1645993"
+         inkscape:collect="always"
+         id="feGaussianBlur19" />
+    </filter>
+    <filter
+       id="filter18650"
+       width="1.7653"
+       y="-0.023490001"
+       x="-0.38264999"
+       height="1.0470001"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="2.670959"
+         inkscape:collect="always"
+         id="feGaussianBlur22" />
+    </filter>
+    <filter
+       id="filter18654"
+       width="1.494"
+       y="-0.018502001"
+       x="-0.24702001"
+       height="1.0369999"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="2.829191"
+         inkscape:collect="always"
+         id="feGaussianBlur25" />
+    </filter>
+    <filter
+       id="filter18670"
+       width="2.2070999"
+       y="-0.12819999"
+       x="-0.60354"
+       height="1.2564"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="2.8678247"
+         inkscape:collect="always"
+         id="feGaussianBlur28" />
+    </filter>
+    <filter
+       id="filter25984"
+       width="1.1176"
+       y="-0.17903"
+       x="-0.058800001"
+       height="1.3581001"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="19.043014"
+         inkscape:collect="always"
+         id="feGaussianBlur31" />
+    </filter>
+    <filter
+       id="filter26000"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="12.322873"
+         inkscape:collect="always"
+         id="feGaussianBlur34" />
+    </filter>
+    <filter
+       id="filter26008"
+       width="1.7708"
+       y="-0.1191"
+       x="-0.38538"
+       height="1.2381999"
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="23.090638"
+         inkscape:collect="always"
+         id="feGaussianBlur37" />
+    </filter>
+    <linearGradient
+       id="linearGradient48025"
+       x1="-61.349998"
+       gradientUnits="userSpaceOnUse"
+       y1="463.91"
+       gradientTransform="matrix(0.01502804,0,0,0.01604687,25.853839,827.96121)"
+       x2="82.447998"
+       y2="463.91"
+       inkscape:collect="always">
+      <stop
+         stop-color="#ffbd55"
+         offset="0"
+         id="stop40" />
+      <stop
+         stop-color="#cd7b44"
+         offset=".3"
+         id="stop42" />
+      <stop
+         stop-color="#d19829"
+         offset=".54966"
+         id="stop44" />
+      <stop
+         offset=".79931"
+         id="stop46" />
+      <stop
+         stop-color="#ffc155"
+         offset="1"
+         id="stop48" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient50451"
+       x1="-49.422001"
+       gradientUnits="userSpaceOnUse"
+       y1="451.98999"
+       gradientTransform="matrix(0.01502804,0,0,0.01604687,25.853839,827.96121)"
+       x2="69.258003"
+       y2="451.98999"
+       inkscape:collect="always">
+      <stop
+         stop-color="#2c2f33"
+         offset="0"
+         id="stop51" />
+      <stop
+         stop-color="#959799"
+         offset=".024"
+         id="stop53" />
+      <stop
+         stop-color="#FFF"
+         offset=".048"
+         id="stop55" />
+      <stop
+         stop-color="#2d2d2d"
+         offset=".11406"
+         id="stop57" />
+      <stop
+         stop-color="#adadae"
+         offset=".21069"
+         id="stop59" />
+      <stop
+         stop-color="#898989"
+         offset=".28078"
+         id="stop61" />
+      <stop
+         stop-color="#FFF"
+         offset=".40167"
+         id="stop63" />
+      <stop
+         stop-color="#FFF"
+         offset=".64231"
+         id="stop65" />
+      <stop
+         offset=".86118"
+         id="stop67" />
+      <stop
+         stop-color="#FFF"
+         offset=".94329"
+         id="stop69" />
+      <stop
+         offset="1"
+         id="stop71" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient52877"
+       x1="63.104"
+       gradientUnits="userSpaceOnUse"
+       y1="-276.88"
+       gradientTransform="matrix(0.01502804,0,0,0.01604687,25.853839,827.96121)"
+       x2="63.104"
+       y2="-25.188999"
+       inkscape:collect="always">
+      <stop
+         stop-color="#FFF"
+         offset="0"
+         id="stop74" />
+      <stop
+         stop-color="#f8f8d5"
+         offset=".15"
+         id="stop76" />
+      <stop
+         stop-color="#a29e89"
+         offset=".57519"
+         id="stop78" />
+      <stop
+         stop-color="#bfb69a"
+         offset=".80602"
+         id="stop80" />
+      <stop
+         stop-color="#eeeebe"
+         offset=".91598"
+         id="stop82" />
+      <stop
+         stop-color="#FFF"
+         offset="1"
+         id="stop84" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     transform="translate(-19.691,-823.66114)"
+     inkscape:groupmode="layer"
+     id="g123">
+    <rect
+       ry="93.403"
+       style="color:#000000;fill:#b3b3b3;filter:url(#filter25984)"
+       rx="49.098"
+       transform="matrix(0.01368437,0,0,0.01341039,20.00755,824.59424)"
+       height="255.28999"
+       width="777.27002"
+       y="-7.7350998"
+       x="34.588001"
+       id="rect89" />
+    <path
+       style="color:#000000;fill:#666666;filter:url(#filter26008)"
+       d="M 426.17,456.7 H 545.5 c 19.45,154.41 14.645,302.88 0.2703,457.3 -41.636,12.659 -79.246,8.247 -118.79,0.8111 -13.975,-154.41 -18.601,-303.69 -0.81106,-458.11 z"
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.0108859,0,0,0.01688333,21.054394,823.56031)"
+       id="path91" />
+    <path
+       style="color:#000000;text-indent:0;text-transform:none;fill:#cccccc;filter:url(#filter26000)"
+       d="m 99.764,134.92 c -28.563,0 -49.656,26.332 -49.656,56.062 v 106.12 c 0,29.731 21.093,56.031 49.656,56.031 h 301.5 c 23.058,0 36.233,4.7943 43.5,11.5 7.2667,6.7058 10.969,16.889 10.969,34 l 0.062,61.625 27,-0.031 -0.062,-61.594 v -0.031 c -0.01,-21.347 -5.3933,-40.651 -19.656,-53.812 -14.27,-13.168 -35.049,-18.656 -61.812,-18.656 h -301.5 c -11.522,0 -22.656,-11.623 -22.656,-29.031 v -106.12 c 0,-17.408 11.135,-29.062 22.656,-29.062 h 423.16 v -27 H 99.765 Z"
+       sodipodi:nodetypes="cssssscccccsssssscccc"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.01379309,0,0,0.01604687,19.640321,823.9417)"
+       id="path93" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient50451);stroke-width:0.08201257"
+       ry="0.32332721"
+       height="9.0950603"
+       width="1.7863799"
+       y="830.66724"
+       x="25.116051"
+       id="rect95" />
+    <path
+       style="color:#000000;fill:#ffffff;filter:url(#filter5851)"
+       d="m 45.652,180.66 c 0,2.8543 -14.698,-5.7295 -34.916,-5.7295 -32.567,0 -34.745,25.455 -41.006,25.19 -2.4241,-0.10284 -0.86439,-38.25 40.837,-35.137 20.207,1.5088 35.085,4.6491 35.085,15.677 z"
+       sodipodi:nodetypes="sssss"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.01971225,0,0,0.01037389,25.833999,829.08754)"
+       id="path97" />
+    <path
+       style="color:#000000;text-indent:0;text-transform:none;stroke-width:0.08201257"
+       inkscape:connector-curvature="0"
+       d="m 20.442796,825.44681 c -0.429245,0 -0.746235,0.42253 -0.746235,0.89956 v 1.70302 c 0,0.47705 0.31699,0.89915 0.746235,0.89915 h 4.530951 c 0.346522,0 0.544517,0.077 0.653717,0.18454 0.109201,0.1076 0.164837,0.27102 0.164837,0.5456 l 9.39e-4,0.98892 0.405753,-5.3e-4 -9.38e-4,-0.98839 v -5.1e-4 c -7.3e-5,-0.34256 -0.08105,-0.65232 -0.295393,-0.8635 -0.214447,-0.2113 -0.526716,-0.29937 -0.928904,-0.29937 h -4.530951 c -0.173147,0 -0.340484,-0.18651 -0.340484,-0.46585 v -1.703 c 0 [...]
+       id="path99" />
+    <path
+       style="color:#000000;text-indent:0;text-transform:none;fill:#ffffff;filter:url(#filter5889)"
+       d="m 781.7,97.401 c -237.4,0.23749 -474.84,-0.16911 -712.25,0.21875 -23.369,2.2736 -39.727,26.327 -38.076,48.969 -0.39642,37.585 -0.51427,75.224 0.23226,112.78 2.4929,21.387 20.996,41.917 43.531,40.356 95.285,0.20258 190.59,-0.58711 285.88,0.27198 18.99,0.3521 39.64,-1.8231 56.375,9.0591 12.329,6.8164 17.719,20.963 18.872,34.336 1.1809,23.642 0.44642,54.32 1.0966,75.992 l 10.719,0.0489 -0.79265,-74.183 c -0.0783,-7.3321 -1.9233,-14.522 -4.1448,-21.601 -7.2588,-18.772 -25.832,-31.1 [...]
+       sodipodi:nodetypes="ccccccccccsccccccccccc"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.01502804,0,0,0.01604687,19.400714,823.9417)"
+       id="path101" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient52877);stroke-width:0.08201257"
+       rx="0.73783809"
+       ry="1.4988376"
+       height="4.096591"
+       width="11.681152"
+       y="823.50189"
+       x="19.920483"
+       id="rect103" />
+    <path
+       style="color:#000000;fill:url(#linearGradient48025);stroke-width:0.08201257"
+       inkscape:connector-curvature="0"
+       d="m 25.10613,831.67233 h 1.793285 c 0.292291,2.47782 0.220084,4.86027 0.0041,7.33815 -0.625701,0.20318 -1.190894,0.13238 -1.785188,0.0134 -0.210021,-2.47789 -0.279546,-4.87338 -0.01219,-7.35114 z"
+       sodipodi:nodetypes="ccccc"
+       id="path105" />
+    <path
+       style="color:#000000;fill:#ffcc00;filter:url(#filter18670)"
+       d="m 439.17,487.01 h 7.1576 c -8.4859,8.9501 -6.5044,32.321 -9.7148,53.689 -1.3723,-17.915 -3.9847,-36.366 2.5572,-53.689 z"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.01502804,0,0,0.01604687,19.400714,823.9417)"
+       id="path107" />
+    <path
+       style="color:#000000;opacity:0.81667002;fill:#c87137;filter:url(#filter18646)"
+       d="m 393.6,482.68 h 12.108 c -3.345,26.498 -8.8476,95.689 -16.433,158.95 -1.9116,-52.984 0.50524,-105.97 4.3257,-158.95 z"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.01502804,0,0,0.01604687,19.400714,823.9417)"
+       id="path109" />
+    <path
+       style="color:#000000;fill:#c87137;filter:url(#filter18638)"
+       d="m 434.22,946.74 h 12.108 c -14.354,-38.99 -11.003,-140.8 -16.433,-233.89 -2.3214,78.047 -6.7404,158.42 4.3257,233.89 z"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.01502804,0,0,0.01604687,19.400714,823.9417)"
+       id="path111" />
+    <path
+       style="color:#000000;opacity:0.55832998;fill:#c87137;filter:url(#filter18654)"
+       d="m 480.24,487.27 h -12.108 c 15.983,38.861 24.555,220.56 15.352,366.98 19.755,-137.83 13.012,-286.47 -3.2443,-366.98 z"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.01502804,0,0,0.01604687,19.400714,823.9417)"
+       id="path113" />
+    <path
+       style="color:#000000;opacity:0.52082998;fill:#ffcc00;filter:url(#filter18634)"
+       d="m 439.65,946.74 h 6.6776 c -7.9169,-38.269 -6.0683,-138.2 -9.0634,-229.56 -1.2803,76.603 -3.7175,155.49 2.3857,229.56 z"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.01502804,0,0,0.01604687,19.400714,823.9417)"
+       id="path115" />
+    <path
+       style="color:#000000;fill:#ffcc00;filter:url(#filter18650)"
+       d="m 472.39,487.27 h -5.3392 c 7.0482,29.242 17.317,162.72 13.258,272.9 8.7116,-103.71 -0.75019,-212.32 -7.9192,-272.9 z"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.01502804,0,0,0.01604687,19.400714,823.9417)"
+       id="path117" />
+    <path
+       style="color:#000000;filter:url(#filter5851)"
+       d="m 42.898,176.9 c 0,2.8543 -20.207,-4.4749 -40.425,-4.4749 -20.277,0 -38.737,9.4161 -44.608,5.1158 -2.4241,-1.7756 2.5119,-14.411 44.227,-12.136 19.995,1.0906 40.806,0.46705 40.806,11.495 z"
+       sodipodi:nodetypes="sssss"
+       inkscape:connector-curvature="0"
+       transform="matrix(-0.01917492,0,0,-0.01037389,26.041464,833.4859)"
+       id="path119" />
+    <path
+       style="color:#000000;fill:#ffcc00;filter:url(#filter18598)"
+       d="m -37.824,392.25 h 7.1576 c -8.4859,21.029 -6.5044,75.939 -9.7148,126.14 -1.3723,-42.093 -3.9847,-85.442 2.5572,-126.14 z"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       transform="matrix(0.02404486,0.00149451,0.0012809,-0.02805469,25.72987,848.10822)"
+       id="path121" />
+  </g>
+  <metadata
+     id="metadata125">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2011-06-06T12:56:53</dc:date>
+        <dc:description />
+        <dc:source>https://openclipart.org/detail/142777/paint-rollers-by-maxim2</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>maxim2</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>Paint Rollers</rdf:li>
+            <rdf:li>tool</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/images/presets/education/library.svg b/images/presets/education/library.svg
index b1236f6..ca3ad5c 100644
--- a/images/presets/education/library.svg
+++ b/images/presets/education/library.svg
@@ -7,370 +7,102 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
    width="16"
    height="16"
+   viewBox="0 0 16 16"
    id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="library3.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="08.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="24.296875"
+     inkscape:cx="2.6330947"
+     inkscape:cy="8.1240404"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     viewbox-height="16">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata2975">
+     id="metadata7">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
         <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="988"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="58.987334"
-     inkscape:cx="8.5891415"
-     inkscape:cy="6.556354"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:current-layer="svg2"
-     showgrid="true"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4186" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="6.1230318e-014 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       id="perspective2441" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_z="60 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <symbol
-       viewBox="244.5 110 489 219.9"
-       id="symbol-university">
-      <path
-         id="path4460"
-         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path4462"
-         d="M 94,176 73,215"
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#000000;stroke-width:20" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1037.3622)">
+    <g
+       id="g1327"
+       style="fill:#ffffff;stroke:none"
+       transform="matrix(0.02775633,0,0,0.02770795,-0.04729679,1037.315)">
       <path
-         id="path4464"
-         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.895,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.315 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
+         style="fill:#ffffff;stroke:none;stroke-width:3.40799999"
+         id="path1329"
          inkscape:connector-curvature="0" />
-      <path
-         id="path4466"
-         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
-         ill="none"
-         inkscape:connector-curvature="0"
-         style="stroke:#000000;stroke-width:20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_z="12 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3826"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3855"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3909"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3950"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3972"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3994"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4016"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4837"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4971"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6216"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6764"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6817"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.79354273,1.2601716)"
-       xlink:href="#linearGradient829"
-       id="radialGradient874"
-       cx="180.2453"
-       cy="198.41902"
-       r="101.58017"
-       fx="180.2453"
-       fy="198.41902" />
-    <linearGradient
-       id="linearGradient829">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0.341667;"
-         offset="0.0000000"
-         id="stop830" />
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
-         offset="1.0000000"
-         id="stop831" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.007004,0.99304475)"
-       xlink:href="#linearGradient829"
-       id="radialGradient832"
-       cx="360.85147"
-       cy="167.47372"
-       r="46.394722"
-       fx="360.85147"
-       fy="167.47372" />
-    <linearGradient
-       id="linearGradient6826">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0.341667;"
-         offset="0.0000000"
-         id="stop6828" />
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
-         offset="1.0000000"
-         id="stop6830" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(0.74491357,1.3424376)"
-       xlink:href="#linearGradient855"
-       id="linearGradient850"
-       x1="465.29425"
-       y1="248.24467"
-       x2="463.27057"
-       y2="405.76871"
-       spreadMethod="pad" />
-    <linearGradient
-       id="linearGradient855">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
-         offset="0.0000000"
-         id="stop856" />
-      <stop
-         style="stop-color: rgb(255, 166, 23); stop-opacity: 0.733333;"
-         offset="1.0000000"
-         id="stop857" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="scale(1.4586159,0.68558144)"
-       xlink:href="#linearGradient855"
-       id="linearGradient854"
-       x1="157.80582"
-       y1="120.96176"
-       x2="155.40575"
-       y2="231.6349" />
-    <linearGradient
-       id="linearGradient6837">
-      <stop
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
-         offset="0.0000000"
-         id="stop6839" />
-      <stop
-         style="stop-color: rgb(255, 166, 23); stop-opacity: 0.733333;"
-         offset="1.0000000"
-         id="stop6841" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective6928"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective10781"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective10806"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective10878"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective10919"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <clipPath
-       id="clipoutline2"
-       clipPathUnits="userSpaceOnUse">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 55.8,12 0.76,0.16 c 8.84,-2.94 28.68,8.64 24.26,18.96 -1.12,1.62 -0.93,4.5 0.42,6.31 L 56.43,62.25 c -1.39,-1.39 -4.48,-1.36 -5.9,0 L 9.5,101.63 c -3.74,3.59 -0.8,6.64 0.78,8.25 l 7.36,7.36 c 1.61,1.6 5.86,3.76 8.88,0.56 L 65.24,76.99 c 1.35,-1.42 1.36,-4.47 0,-5.87 0,0 0.01,-0.02 0,-0.02 L 90.15,46.2 c 2.63,2.37 5.113827,2.574854 7.47,1.93 4.55057,-1.245432 7.08725,3.206643 9.81,6.46 l -1.23,1.21 c -1.82,1.84 -1.65,4.94 0.39,6.98 2.04,2.04 5.15,2.21 6.97,0.39 l 8.14,-8.13  [...]
-         id="outline2" />
-    </clipPath>
-  </defs>
-  <g
-     id="g1327"
-     style="fill:#ffffff;stroke:none"
-     transform="matrix(0.02775633,0,0,0.02770795,-0.04729675,-0.04723)">
+    </g>
+    <g
+       id="g3338"
+       transform="matrix(0.03854698,-0.0067251,0.0067251,0.03854698,-5.1054902,1035.8123)" />
+    <ellipse
+       style="fill:#000000"
+       cx="8.1412296"
+       cy="1040.4108"
+       id="circle2193"
+       rx="2.0264597"
+       ry="2.0264595" />
     <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       style="fill:#ffffff;stroke:none;stroke-width:3.40799999"
-       id="path1329"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,-597.30675)">
-    <rect
-       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4134"
-       width="10"
-       height="10"
-       x="1"
-       y="1" />
-    <rect
-       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4136"
-       width="8"
-       height="8"
-       x="2"
-       y="2" />
+       style="fill:#000000"
+       inkscape:connector-curvature="0"
+       d="m 10.109845,1042.9299 c 0.927395,0.034 1.31552,0.7744 1.31552,0.7744 l 2.991174,4.0996 c 0.123155,0.1847 0.195928,0.4049 0.195928,0.6456 0,0.6382 -0.516878,1.155 -1.155045,1.155 -0.151145,0 -0.291093,-0.034 -0.425444,-0.084 l -1.804408,-0.5019 v 1.8007 H 4.9671904 v -1.8007 l -1.8044074,0.5019 c -0.1287531,0.05 -0.272434,0.084 -0.4254448,0.084 -0.6381669,0 -1.1550447,-0.5168 -1.1550447,-1.155 0,-0.2407 0.072773,-0.4609 0.1996604,-0.6456 l 2.987442,-4.0996 c 0,0 0.3937228,-0.740 [...]
+       id="path2195" />
+    <path
+       style="fill:#000000"
+       inkscape:connector-curvature="0"
+       d="m 14.53223,1052.3214 c 0.160474,0 0.287361,-0.1913 0.287361,-0.4331 v 0 c 0,-0.2419 -0.126887,-0.4331 -0.287361,-0.4331 H 1.892047 c -0.1548768,0 -0.2873617,0.1912 -0.2873617,0.4331 v 0 c 0,0.2418 0.1324849,0.4331 0.2873617,0.4331 z"
+       id="path2197" />
   </g>
-  <g
-     id="g3338"
-     transform="matrix(0.03854698,-0.0067251,0.0067251,0.03854698,-5.1054902,-1.54989)" />
-  <ellipse
-     style="fill:#000000"
-     cx="8.1412296"
-     cy="3.048584"
-     id="circle2193"
-     rx="2.0264597"
-     ry="2.0264595" />
-  <path
-     style="fill:#000000"
-     inkscape:connector-curvature="0"
-     d="m 10.109845,5.56771 c 0.927395,0.0336 1.31552,0.77439 1.31552,0.77439 l 2.991174,4.09957 c 0.123155,0.18473 0.195928,0.40492 0.195928,0.64563 0,0.63816 -0.516878,1.15504 -1.155045,1.15504 -0.151145,0 -0.291093,-0.0336 -0.425444,-0.084 l -1.804408,-0.50195 0,1.80068 -6.2603796,0 0,-1.80068 -1.8044074,0.50195 c -0.1287531,0.0504 -0.272434,0.084 -0.4254448,0.084 -0.6381669,0 -1.1550447,-0.51688 -1.1550447,-1.15504 0,-0.24071 0.072773,-0.4609 0.1996604,-0.64563 L 4.7693959,6.3421 c 0 [...]
-     id="path2195" />
-  <path
-     style="fill:#000000"
-     inkscape:connector-curvature="0"
-     d="m 14.53223,14.959162 c 0.160474,0 0.287361,-0.191239 0.287361,-0.433087 l 0,0 c 0,-0.241863 -0.126887,-0.433102 -0.287361,-0.433102 l -12.640183,0 c -0.1548768,0 -0.2873617,0.191239 -0.2873617,0.433102 l 0,0 c 0,0.241848 0.1324849,0.433087 0.2873617,0.433087 l 12.640183,0 z"
-     id="path2197" />
 </svg>
diff --git a/images/presets/education/school.svg b/images/presets/education/school.svg
index 0eabfe8..bbaad18 100644
--- a/images/presets/education/school.svg
+++ b/images/presets/education/school.svg
@@ -10,188 +10,17 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
    width="16"
-   height="15.999999"
+   height="16"
+   viewBox="0 0 16 16"
    id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="school3.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata2975">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="988"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="61.062931"
-     inkscape:cx="8.7350305"
-     inkscape:cy="8.9119699"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:current-layer="svg2"
-     showgrid="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4219" />
-  </sodipodi:namedview>
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="10.svg">
   <defs
      id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       id="perspective2441" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_z="60 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <symbol
-       viewBox="244.5 110 489 219.9"
-       id="symbol-university">
-      <path
-         id="path4460"
-         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path4462"
-         d="M 94,176 73,215"
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#000000;stroke-width:20" />
-      <path
-         id="path4464"
-         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path4466"
-         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
-         ill="none"
-         inkscape:connector-curvature="0"
-         style="stroke:#000000;stroke-width:20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_z="12 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       viewBox="0 0 10 10"
-       refY="5"
-       refX="10"
-       orient="auto"
-       markerWidth="4"
-       markerUnits="strokeWidth"
-       markerHeight="3"
-       id="ArrowStart">
-      <path
-         id="path3634"
-         d="M 10,0 0,5 10,10 Z"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       viewBox="0 0 10 10"
-       refY="5"
-       refX="0"
-       orient="auto"
-       markerWidth="4"
-       markerUnits="strokeWidth"
-       markerHeight="3"
-       id="ArrowEnd">
-      <path
-         id="path3631"
-         d="M 0,0 10,5 0,10 Z"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:perspective
-       id="perspective2510"
-       inkscape:persp3d-origin="306.082 : 204.39034 : 1"
-       inkscape:vp_z="612.164 : 306.58551 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 306.58551 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       viewBox="0 0 10 10"
-       refY="5"
-       refX="10"
-       orient="auto"
-       markerWidth="4"
-       markerUnits="strokeWidth"
-       markerHeight="3"
-       id="marker2611">
-      <path
-         id="path1325"
-         d="M 10,0 0,5 10,10 Z"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       viewBox="0 0 10 10"
-       refY="5"
-       refX="0"
-       orient="auto"
-       markerWidth="4"
-       markerUnits="strokeWidth"
-       markerHeight="3"
-       id="marker2608">
-      <path
-         id="path1322"
-         d="M 0,0 10,5 0,10 Z"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:perspective
-       id="perspective2605"
-       inkscape:persp3d-origin="306.082 : 204.39034 : 1"
-       inkscape:vp_z="612.164 : 306.58551 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 306.58551 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2656"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
+       gradientTransform="translate(0.01424249,1037.3622)"
        inkscape:collect="always"
        xlink:href="#linearGradient4223-2"
        id="linearGradient4229-0"
@@ -213,48 +42,85 @@
          id="stop4227-8" />
     </linearGradient>
   </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="24.296875"
+     inkscape:cx="2.6330947"
+     inkscape:cy="8.1240404"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     viewbox-height="16">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
   <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,-597.30675)">
-    <rect
-       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4134"
-       width="10"
-       height="10"
-       x="1"
-       y="1" />
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1037.3622)">
+    <path
+       id="path3526"
+       style="opacity:1;fill:none;fill-rule:evenodd;stroke:#804e08;stroke-width:1.03097248;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.4272008,1052.8399 1.50149,-3.6352 2.25264,-1.2991 0.0548,-4.9269 0.61987,-1.3475 1.58252,-3.7467 m 6.1170992,14.9554 -1.13522,-2.7484 -3.6200992,-5.8698 0.1387,-3.0453 -1.39466,-3.2919"
+       sodipodi:nodetypes="ccccccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#804e08;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1.0142425,1049.3621 H 15.014242"
+       id="path4221"
+       inkscape:connector-curvature="0" />
     <rect
-       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4136"
-       width="8"
-       height="8"
-       x="2"
-       y="2" />
+       y="1040.6694"
+       x="1.3279165"
+       height="8.3791513"
+       width="13.372833"
+       id="rect3544"
+       style="fill:#ffffff;fill-opacity:1;stroke:#005800;stroke-width:0.62734801;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="fill:url(#linearGradient4229-0);fill-opacity:1;stroke:none;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 1.3938003,1040.802 v 8.3797 H 14.766685 v -8.3797 z m 2.1376982,0.7915 c 0.3745631,0 0.6751058,0.022 0.9023031,0.064 0.2271973,0.042 0.416755,0.1296 0.5682259,0.2628 0.1064328,0.092 0.1903695,0.2223 0.2517826,0.3913 0.061395,0.1691 0.092083,0.3309 0.092092,0.4845 v 1.4408 c -9.1e-6,0.1537 0.00994,0.2748 0.029375,0.3619 0.019431,0.087 0.06185,0.1982 0.1273601,0.3334 H 4.3299324 c -0.047073,-0.084 -0.077724,-0.1481 -0.092092,-0.1922 -0.014322,-0.044 -0.028736,-0.1137 -0.04315,- [...]
+       id="rect3530-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccsccccccccccscscccccsccccccccsccccscscscccccscscscccscccscsccscccccccsccscccccssscscscs" />
   </g>
-  <path
-     id="path3526"
-     style="opacity:1;fill:none;fill-rule:evenodd;stroke:#804e08;stroke-width:1.03097248;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 1.4129583,15.477724 1.50149,-3.63519 2.25264,-1.29915 0.0548,-4.9269304 0.61987,-1.34745 1.58252,-3.74675002 m 6.1170997,14.95547042 -1.13522,-2.74842 -3.6200997,-5.8698204 0.1387,-3.04528 -1.39466,-3.29195002"
-     sodipodi:nodetypes="ccccccccccc"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#804e08;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 1,11.999899 14,0"
-     id="path4221"
-     inkscape:connector-curvature="0" />
-  <rect
-     y="3.3071737"
-     x="1.313674"
-     height="8.3791513"
-     width="13.372833"
-     id="rect3544"
-     style="fill:#ffffff;fill-opacity:1;stroke:#005800;stroke-width:0.62734801;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-  <path
-     style="fill:url(#linearGradient4229-0);fill-opacity:1;stroke:none;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     d="m 1.3795578,3.439849 0,8.379646 13.3728852,0 0,-8.379646 z M 3.517256,4.2313246 c 0.3745631,0 0.6751058,0.021736 0.9023031,0.063745 0.2271973,0.042009 0.416755,0.1296629 0.5682259,0.2628511 0.1064328,0.092211 0.1903695,0.2222754 0.2517826,0.3913268 0.061395,0.1690422 0.092083,0.330815 0.092092,0.4844964 l 0,1.4407402 c -9.1e-6,0.1536814 0.00994,0.2748147 0.029375,0.361902 0.019431,0.087124 0.06185,0.1982205 0.1273601,0.3334634 l -1.1727048,0 C 4.2686172,7.4858304 4.2379654,7.4216 [...]
-     id="rect3530-7"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccsccccccccccscscccccsccccccccsccccscscscccccscscscccscccscsccscccccccsccscccccssscscscs" />
 </svg>
diff --git a/images/presets/misc/angles.svg b/images/presets/misc/angles.svg
index 1d363cc..fbe66af 100644
--- a/images/presets/misc/angles.svg
+++ b/images/presets/misc/angles.svg
@@ -21,23 +21,23 @@
     <path inkscape:connector-curvature="0" id="path2995" d="m 387.15644,526.41095 -78.4493,-183.3966" style="fill:none;stroke:#999999;stroke-width:0.85919064px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
     <path style="fill:none;stroke:#999999;stroke-width:0.85919064px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 310.82732,527.28916 385.03626,342.13614" id="path2997" inkscape:connector-curvature="0"/>
     <path inkscape:connector-curvature="0" id="path2999" d="m 256.23349,473.93731 183.3966,-78.44932" style="fill:none;stroke:#999999;stroke-width:0.85919064px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
-    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="321.89999" y="285.73505" id="text3769" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3771" x="321.89999" y="285.73505">0, N</tspan></text>
-    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="446.97031" y="330.67932" id="text3773" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3775" x="446.97031" y="330.67932">45, NE</tspan></text>
-    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="493.19977" y="442.94144" id="text3777" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3779" x="493.19977" y="442.94144">90, E</tspan></text>
-    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="446.79114" y="555.69635" id="text3781" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3783" x="446.79114" y="555.69635">135, SE</tspan></text>
-    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="306.49017" y="600.64063" id="text3785" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3787" x="306.49017" y="600.64063">180, S</tspan></text>
-    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="145.76224" y="556.48486" id="text3789" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3791" x="145.76224" y="556.48486">225, SW</tspan></text>
-    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="114.22587" y="443.13858" id="text3793" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3795" x="114.22587" y="443.13858">270, W</tspan></text>
-    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="142.53693" y="328.31384" id="text3797" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3799" x="142.53693" y="328.31384">315, NW</tspan></text>
-    <text xml:space="preserve" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="359.17023" y="331.46783" id="text3801" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3803" x="359.17023" y="331.46783">22, NNE</tspan></text>
-    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="461.66339" y="381.14304" id="text3805" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3807" x="461.66339" y="381.14304"/></text>
-    <text sodipodi:linespacing="125%" id="text3809" y="395.53311" x="448.94135" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="395.53311" x="448.94135" id="tspan3811" sodipodi:role="line">67, ENE</tspan></text>
-    <text xml:space="preserve" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="447.68707" y="484.23892" id="text3813" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3815" x="447.68707" y="484.23892">112, ESE</tspan></text>
-    <text sodipodi:linespacing="125%" id="text3817" y="550.4726" x="357.73676" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="550.4726" x="357.73676" id="tspan3819" sodipodi:role="line">157, SSE</tspan></text>
-    <text xml:space="preserve" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="256.3187" y="549.38843" id="text3821" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3823" x="256.3187" y="549.38843">202, SSW</tspan></text>
-    <text sodipodi:linespacing="125%" id="text3825" y="490.54694" x="152.39204" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="490.54694" x="152.39204" id="tspan3827" sodipodi:role="line">247, WSW</tspan></text>
-    <text xml:space="preserve" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" x="150.95857" y="392.0835" id="text3829" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3831" x="150.95857" y="392.0835">292, WNW</tspan></text>
-    <text sodipodi:linespacing="125%" id="text3833" y="330.77792" x="252.0183" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve"><tspan y="330.77792" x="252.0183" id="tspan3835" sodipodi:role="line">337, NNW</tspan></text>
+    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial" x="321.89999" y="285.73505" id="text3769" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3771" x="321.89999" y="285.73505">0, N</tspan></text>
+    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial" x="446.97031" y="330.67932" id="text3773" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3775" x="446.97031" y="330.67932">45, NE</tspan></text>
+    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial" x="493.19977" y="442.94144" id="text3777" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3779" x="493.19977" y="442.94144">90, E</tspan></text>
+    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial" x="446.79114" y="555.69635" id="text3781" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3783" x="446.79114" y="555.69635">135, SE</tspan></text>
+    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial" x="306.49017" y="600.64063" id="text3785" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3787" x="306.49017" y="600.64063">180, S</tspan></text>
+    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial" x="145.76224" y="556.48486" id="text3789" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3791" x="145.76224" y="556.48486">225, SW</tspan></text>
+    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial" x="114.22587" y="443.13858" id="text3793" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3795" x="114.22587" y="443.13858">270, W</tspan></text>
+    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial" x="142.53693" y="328.31384" id="text3797" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3799" x="142.53693" y="328.31384">315, NW</tspan></text>
+    <text xml:space="preserve" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial" x="359.17023" y="331.46783" id="text3801" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3803" x="359.17023" y="331.46783">22, NNE</tspan></text>
+    <text xml:space="preserve" style="font-size:28px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial" x="461.66339" y="381.14304" id="text3805" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3807" x="461.66339" y="381.14304"/></text>
+    <text sodipodi:linespacing="125%" id="text3809" y="395.53311" x="448.94135" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial" xml:space="preserve"><tspan y="395.53311" x="448.94135" id="tspan3811" sodipodi:role="line">67, ENE</tspan></text>
+    <text xml:space="preserve" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial" x="447.68707" y="484.23892" id="text3813" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3815" x="447.68707" y="484.23892">112, ESE</tspan></text>
+    <text sodipodi:linespacing="125%" id="text3817" y="550.4726" x="357.73676" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial" xml:space="preserve"><tspan y="550.4726" x="357.73676" id="tspan3819" sodipodi:role="line">157, SSE</tspan></text>
+    <text xml:space="preserve" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial" x="256.3187" y="549.38843" id="text3821" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3823" x="256.3187" y="549.38843">202, SSW</tspan></text>
+    <text sodipodi:linespacing="125%" id="text3825" y="490.54694" x="152.39204" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial" xml:space="preserve"><tspan y="490.54694" x="152.39204" id="tspan3827" sodipodi:role="line">247, WSW</tspan></text>
+    <text xml:space="preserve" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial" x="150.95857" y="392.0835" id="text3829" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3831" x="150.95857" y="392.0835">292, WNW</tspan></text>
+    <text sodipodi:linespacing="125%" id="text3833" y="330.77792" x="252.0183" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#666666;fill-opacity:1;stroke:none;font-family:Arial" xml:space="preserve"><tspan y="330.77792" x="252.0183" id="tspan3835" sodipodi:role="line">337, NNW</tspan></text>
   </g>
 <style id="stylish-2" class="stylish" type="text/css">@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 .findbar-container > *{
diff --git a/images/statusline/angle.png b/images/statusline/angle.png
deleted file mode 100644
index aa6cae7..0000000
Binary files a/images/statusline/angle.png and /dev/null differ
diff --git a/images/statusline/angle.svg b/images/statusline/angle.svg
new file mode 100644
index 0000000..d834e8a
--- /dev/null
+++ b/images/statusline/angle.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="18px" height="18px" viewBox="0 0 18 18" fill="none">
+  <path d="M12,3A16.5,16.5 0 0 1 16.5,14" stroke="#e42"/>
+  <path d="M13,2L1,14H18" stroke-width="2" stroke-linejoin="bevel" stroke="#000"/>
+</svg>
diff --git a/images/statusline/dist.png b/images/statusline/dist.png
deleted file mode 100644
index 9db5ad9..0000000
Binary files a/images/statusline/dist.png and /dev/null differ
diff --git a/images/statusline/dist.svg b/images/statusline/dist.svg
new file mode 100644
index 0000000..40eac1e
--- /dev/null
+++ b/images/statusline/dist.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="18px" height="18px" viewBox="0 0 18 18" fill="none">
+  <path d="M.5,8.5h17v6h-17zM3.5,11v3m3,-2v2m3,-3v3m3,-2v2m3,-3v3" stroke="#000"/>
+</svg>
diff --git a/images/statusline/heading.png b/images/statusline/heading.png
deleted file mode 100644
index ecfdda2..0000000
Binary files a/images/statusline/heading.png and /dev/null differ
diff --git a/images/statusline/heading.svg b/images/statusline/heading.svg
new file mode 100644
index 0000000..377bdec
--- /dev/null
+++ b/images/statusline/heading.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="18px" height="18px" viewBox="0 0 18 18" fill="none">
+  <path d="M9,1a 8,8 0 1 1 -0.001,0z" stroke="#000"/>
+  <path d="M9,9l8,-8" stroke="#e42" stroke-width="2"/>
+</svg>
diff --git a/images/statusline/lat.png b/images/statusline/lat.png
deleted file mode 100644
index 53ab5f1..0000000
Binary files a/images/statusline/lat.png and /dev/null differ
diff --git a/images/statusline/lat.svg b/images/statusline/lat.svg
new file mode 100644
index 0000000..68c3cf8
--- /dev/null
+++ b/images/statusline/lat.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="18px" height="18px" viewBox="0 0 18 18" fill="none">
+  <path d="M0,9h18" stroke="#e42" stroke-width="2"/>
+  <path d="M9,1a 8,8 0 1 1 -0.001,0z" stroke="black" />
+</svg>
diff --git a/images/statusline/lon.png b/images/statusline/lon.png
deleted file mode 100644
index 1477194..0000000
Binary files a/images/statusline/lon.png and /dev/null differ
diff --git a/images/statusline/lon.svg b/images/statusline/lon.svg
new file mode 100644
index 0000000..22441aa
--- /dev/null
+++ b/images/statusline/lon.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="18px" height="18px" viewBox="0 0 18 18" fill="none">
+  <path d="M9,0v18" stroke="#e42" stroke-width="2"/>
+  <path d="M9,1a 8,8 0 1 1 -0.001,0z" stroke="black" />
+</svg>
diff --git a/netbeans/nbproject/project.properties b/netbeans/nbproject/project.properties
index 7dcd191..6339b23 100644
--- a/netbeans/nbproject/project.properties
+++ b/netbeans/nbproject/project.properties
@@ -37,7 +37,7 @@ file.reference.commons-logging-1.1.3.jar=../test/lib/unitils-core/commons-loggin
 file.reference.commons-testing-2.1.0.jar=../test/lib/commons-testing/commons-testing-2.1.0.jar
 file.reference.core-src=../src
 file.reference.debug-1.0.jar=../test/lib/fest/debug-1.0.jar
-file.reference.equalsverifier-2.4.jar=../test/lib/equalsverifier-2.4.jar
+file.reference.equalsverifier-2.4.2.jar=../test/lib/equalsverifier-2.4.2.jar
 file.reference.fest-assert-1.0.jar=../test/lib/fest/fest-assert-1.0.jar
 file.reference.fest-reflect-1.1.jar=../test/lib/fest/fest-reflect-1.1.jar
 file.reference.fest-swing-1.1.jar=../test/lib/fest/fest-swing-1.1.jar
@@ -57,7 +57,7 @@ file.reference.test-performance=../test/performance
 file.reference.test-unit=../test/unit
 file.reference.unitils-core-3.4.6.jar=../test/lib/unitils-core/unitils-core-3.4.6.jar
 file.reference.system-rules-1.16.1.jar=../test/lib/system-rules-1.16.1.jar
-file.reference.wiremock-standalone-2.10.1.jar=../test/lib/wiremock-standalone-2.10.1.jar
+file.reference.wiremock-standalone-2.13.0.jar=../test/lib/wiremock-standalone-2.13.0.jar
 file.reference.awaitility-3.0.0.jar=../test/lib/awaitility-3.0.0.jar
 includes=**/*.java
 jar.compress=false
@@ -75,7 +75,7 @@ javac.test.classpath=\
     ${build.classes.dir}:\
     ${file.reference.junit-4.12.jar}:\
     ${file.reference.jfcunit.jar}:\
-    ${file.reference.equalsverifier-2.4.jar}:\
+    ${file.reference.equalsverifier-2.4.2.jar}:\
     ${file.reference.hamcrest-core-1.3.jar}:\
     ${file.reference.MRJToolkitStubs-1.0.jar}:\
     ${file.reference.debug-1.0.jar}:\
@@ -93,7 +93,7 @@ javac.test.classpath=\
     ${file.reference.ognl-2.6.9.jar}:\
     ${file.reference.unitils-core-3.4.6.jar}:\
     ${file.reference.system-rules-1.16.1.jar}:\
-    ${file.reference.wiremock-standalone-2.10.1.jar}:\
+    ${file.reference.wiremock-standalone-2.13.0.jar}:\
     ${file.reference.awaitility-3.0.0.jar}:\
     ${file.reference.spotbugs.jar}:\
     ${file.reference.commons-testing-2.1.0.jar}
diff --git a/resources/org/glassfish/json/messages.properties b/resources/org/glassfish/json/messages.properties
index de767fe..893c81a 100644
--- a/resources/org/glassfish/json/messages.properties
+++ b/resources/org/glassfish/json/messages.properties
@@ -1,16 +1,70 @@
-parser.getString.err=JsonParser#getString() is valid only KEY_NAME, VALUE_STRING, VALUE_NUMBER parser states. \
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved.
+#
+# The contents of this file are subject to the terms of either the GNU
+# General Public License Version 2 only ("GPL") or the Common Development
+# and Distribution License("CDDL") (collectively, the "License").  You
+# may not use this file except in compliance with the License.  You can
+# obtain a copy of the License at
+# https://oss.oracle.com/licenses/CDDL+GPL-1.1
+# or LICENSE.txt.  See the License for the specific
+# language governing permissions and limitations under the License.
+#
+# When distributing the software, include this License Header Notice in each
+# file and include the License file at LICENSE.txt.
+#
+# GPL Classpath Exception:
+# Oracle designates this particular file as subject to the "Classpath"
+# exception as provided by Oracle in the GPL Version 2 section of the License
+# file that accompanied this code.
+#
+# Modifications:
+# If applicable, add the following below the License Header, with the fields
+# enclosed by brackets [] replaced by your own identifying information:
+# "Portions Copyright [year] [name of copyright owner]"
+#
+# Contributor(s):
+# If you wish your version of this file to be governed by only the CDDL or
+# only the GPL Version 2, indicate your decision by adding "[Contributor]
+# elects to include this software in this distribution under the [CDDL or GPL
+# Version 2] license."  If you don't indicate a single choice of license, a
+# recipient has the option to distribute your version of this file under
+# either the CDDL, the GPL Version 2 or to extend the choice of license to
+# its licensees as provided above.  However, if you add GPL Version 2 code
+# and therefore, elected the GPL Version 2 license, then the option applies
+# only if the new code is made subject to such option by the copyright
+# holder.
+#
+
+internal.error=Internal Error
+
+parser.getString.err=JsonParser#getString() is valid only for KEY_NAME, VALUE_STRING, VALUE_NUMBER parser states. \
+  But current parser state is {0}
+parser.isIntegralNumber.err=JsonParser#isIntegralNumber() is valid only for VALUE_NUMBER parser state. \
+  But current parser state is {0}
+parser.getInt.err=JsonParser#getInt() is valid only for VALUE_NUMBER parser state. \
+  But current parser state is {0}
+parser.getLong.err=JsonParser#getLong() is valid only for VALUE_NUMBER parser state. \
   But current parser state is {0}
-parser.isIntegralNumber.err=JsonParser#isIntegralNumber() is valid only VALUE_NUMBER parser state. \
+parser.getBigDecimal.err=JsonParser#getBigDecimal() is valid only for VALUE_NUMBER parser state. \
   But current parser state is {0}
-parser.getInt.err=JsonParser#getInt() is valid only VALUE_NUMBER parser state. \
+parser.getArray.err=JsonParser#getArray() or JsonParser#getArrayStream() is valid only for START_ARRAY parser state. \
   But current parser state is {0}
-parser.getLong.err=JsonParser#getLong() is valid only VALUE_NUMBER parser state. \
+parser.getObject.err=JsonParser#getObject() or JsonParser#getObjectStream() is valid only for START_OBJECT parser state. \
   But current parser state is {0}
-parser.getBigDecimal.err=JsonParser#getBigDecimal() is valid only VALUE_NUMBER parser state. \
+parser.getValue.err=JsonParser#getValue() is valid only for START_ARRAY, START_OBJECT, KEY_NAME, VALUE_STRING, VALUE_NUMBER, VALUE_NULL, VALUE_FALSE, VALUE_TRUE parser states. \
+  But current parser state is {0}
+parser.getValueStream.err=JsonParser#getValueStream() the parser must not be in an array or object. \
   But current parser state is {0}
 parser.expected.eof=Expected EOF token, but got {0}
 parser.tokenizer.close.io=I/O error while closing JSON tokenizer
 parser.invalid.token=Invalid token={0} at {1}. Expected tokens are: {2}
+parser.state.err=Unknown value type {0}
+parser.scope.err=Cannot be called for value {0}
+parser.input.enc.detect.failed=Cannot auto-detect encoding, not enough chars
+parser.input.enc.detect.ioerr=I/O error while auto-detecting the encoding of stream
 
 generator.flush.io.err=I/O error while flushing generated JSON
 generator.close.io.err=I/O error while closing JsonGenerator
@@ -24,8 +78,6 @@ generator.illegal.multiple.text=Cannot generate more than one JSON text
 writer.write.already.called=write/writeObject/writeArray/close method is already called
 
 reader.read.already.called=read/readObject/readArray/close method is already called
-reader.expected.array.got.object=Cannot read JSON array, found JSON object
-reader.expected.object.got.array=Cannot read JSON object, found JSON array
 
 objbuilder.name.null=Name in JsonObject's name/value pair cannot be null
 objbuilder.value.null=Value in JsonObject's name/value pair cannot be null
@@ -35,7 +87,26 @@ objbuilder.array.builder.null=Array builder that is used to create a value in Js
 arrbuilder.value.null=Cannot invoke add(null) while building JsonArray.
 arrbuilder.object.builder.null=Object builder that is used to add a value to JSON array cannot be null
 arrbuilder.array.builder.null=Array builder that is used to add a value to JSON array cannot be null
+arrbuilder.valuelist.null=Index: {0}, Size: {1}
 
 tokenizer.unexpected.char=Unexpected char {0} at {1}
 tokenizer.expected.char=Unexpected char {0} at {1}, expecting ''{2}''
 tokenizer.io.err=I/O error while parsing JSON
+
+pointer.format.invalid=A non-empty JSON Pointer must begin with a ''/''
+pointer.mapping.missing=The JSON Object ''{0}'' contains no mapping for the name ''{1}''
+pointer.reference.invalid=The reference value in a JSON Pointer must be a JSON Object or a JSON Array, was ''{0}''
+pointer.array.index.err=Array index format error, was ''{0}''
+pointer.array.index.illegal=Illegal integer format, was ''{0}''
+
+noderef.value.add.err=The root value only allows adding a JSON object or array
+noderef.value.cannot.remove=The JSON value at the root cannot be removed
+noderef.object.missing=Non-existing name/value pair in the object for key {0}
+noderef.array.index.err=An array item index is out of range. Index: {0}, Size: {1}
+
+patch.must.be.array=A JSON Patch must be an array of JSON Objects
+patch.move.proper.prefix=The ''{0}'' path of the patch operation ''move'' is a proper prefix of the ''{1}'' path
+patch.move.target.null=The ''{0}'' path of the patch operation ''move'' does not exist in target object
+patch.test.failed=The JSON Patch operation ''test'' failed for path ''{0}'' and value ''{1}''
+patch.illegal.operation=Illegal value for the op member of the JSON Patch operation: ''{0}''
+patch.member.missing=The JSON Patch operation ''{0}'' must contain a ''{1}'' member
diff --git a/geticons.pl b/scripts/geticons.pl
similarity index 78%
rename from geticons.pl
rename to scripts/geticons.pl
index ad93458..b4985e5 100755
--- a/geticons.pl
+++ b/scripts/geticons.pl
@@ -22,13 +22,22 @@ for my $arg (@ARGV ? @ARGV : @default)
 {
   for my $file (glob($arg))
   {
+    my @defs;
     open(FILE,"<",$file) or die "Could not open $file\n";
     #print "Read file $file\n";
     $/ = $file =~ /\.java$/ ? ";" : $o;
     my $extends = "";
     while(my $l = <FILE>)
     {
+      if($l =~ /private static final String ([A-Z_]+) = ("[^"]+")/)
+      {
+        push(@defs, [$1, $2]);
+      }
       next if $l =~ /NO-ICON/;
+      for my $d (@defs)
+      {
+        $l =~ s/$d->[0]/$d->[1]/g;
+      }
       if($l =~ /icon\s*[:=]\s*["']([^"'+]+?)["']/)
       {
         ++$icons{$1};
@@ -59,11 +68,6 @@ for my $arg (@ARGV ? @ARGV : @default)
         my $i = "statusline/$1";
         ++$icons{$i};
       }
-      if($l =~ /createPreferenceTab\(\"(.*?)\"/)
-      {
-        my $i = "preferences/$1";
-        ++$icons{$i};
-      }
       if($l =~ /setIcon\(\"(.*?)\"/)
       {
         my $i = "statusline/$1";
@@ -79,11 +83,6 @@ for my $arg (@ARGV ? @ARGV : @default)
         my $i = "$1/$2";
         ++$icons{$i};
       }
-      if($l =~ /ImageProvider\.overlay\(.*?,\s*\"(.*?)\",/)
-      {
-        my $i = $1;
-        ++$icons{$i};
-      }
       if($l =~ /getCursor\(\"(.*?)\",\s*\"(.*?)\"/)
       {
         my $i = "cursor/modifier/$2";
@@ -96,11 +95,6 @@ for my $arg (@ARGV ? @ARGV : @default)
         my $i = "cursor/$1";
         ++$icons{$i};
       }
-      if($l =~ /SideButton*\(\s*(?:mark)?tr\s*\(\s*\".*?\"\s*\)\s*,\s*\"(.*?)\"/)
-      {
-        my $i = "dialogs/$1";
-        ++$icons{$i};
-      }
       if($l =~ /super\(\s*tr\(\".*?\"\),\s*\"(.*?)\"/s)
       {
         my $i = "$extends$1";
@@ -111,17 +105,7 @@ for my $arg (@ARGV ? @ARGV : @default)
         my $i = "$extends$1";
         ++$icons{$i};
       }
-      if($l =~ /audiotracericon\",\s*\"(.*?)\"/s)
-      {
-        my $i = "markers/$1";
-        ++$icons{$i};
-      }
-      if($l =~ /\"(.*?)\",\s*parentLayer/s)
-      {
-        my $i = "markers/$1";
-        ++$icons{$i};
-      }
-      if($l =~ /setButtonIcons.*\{(.*)\}/)
+      if($l =~ /setButtonIcons.*\{(.*)\}/ || $l =~ /setButtonIcons\((.*)\)/ )
       {
         my $t = $1;
         while($t =~ /\"(.*?)\"/g)
@@ -159,7 +143,7 @@ for($i = 1; my @ifiles = (glob("images".("/*" x $i).".png"), glob("images".("/*"
     {
       if($haveicons{"$1.png"})
       {
-        print STDERR "File $1 exists twice as .svg and .png.\n";
+        print STDERR "$1: File exists twice as .svg and .png.\n";
       }
       # check for unwanted svg effects
       if(open FILE, "<","images/$ifile")
@@ -171,18 +155,18 @@ for($i = 1; my @ifiles = (glob("images".("/*" x $i).".png"), glob("images".("/*"
         {
           for my $x (split(/\s*;\s*/, $1))
           {
-            print STDERR "Style starts with minus for $ifile: $x\n" if $x =~ /^-/;
+            print STDERR "$ifile: Style starts with minus: $x\n" if $x =~ /^-/;
           }
         }
         if($f =~ /viewBox\s*=\s*["']([^"']+)["']/)
         {
           my $x = $1;
-          print STDERR "ViewBox has float values for $ifile: $x\n" if $x =~ /\./;
+          print STDERR "$ifile: ViewBox has float values: $x\n" if $x =~ /\./;
         }
       }
       else
       {
-        print STDERR "Could not open file $ifile: $1";
+        print STDERR "$ifile: Could not open file: $1";
       }
     }
     $haveicons{$ifile} = 1;
@@ -193,12 +177,12 @@ for my $img (sort keys %icons)
 {
   if($img =~ /\.(png|svg)/)
   {
-    print STDERR "File $img does not exist!\n" if(!-f "images/$img");
+    print STDERR "$img: File does not exist!\n" if(!-f "images/$img");
     delete $haveicons{$img};
   }
   else
   {
-    print STDERR "File $img(.svg|.png) does not exist!\n" if(!-f "images/$img.png" && !-f "images/$img.svg");
+    print STDERR "$img(.svg|.png): File does not exist!\n" if(!-f "images/$img.png" && !-f "images/$img.svg");
     delete $haveicons{"$img.svg"};
     delete $haveicons{"$img.png"};
   }
@@ -206,5 +190,5 @@ for my $img (sort keys %icons)
 
 for my $img (sort keys %haveicons)
 {
-  print "$img\n";
+  print "$img: Unused image.\n";
 }
diff --git a/optimize-images b/scripts/optimize-images
similarity index 100%
rename from optimize-images
rename to scripts/optimize-images
diff --git a/src/org/glassfish/json/messages.properties b/src/org/glassfish/json/messages.properties
deleted file mode 100644
index 42ebcc9..0000000
--- a/src/org/glassfish/json/messages.properties
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013-2017 Oracle and/or its affiliates. All rights reserved.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common Development
-# and Distribution License("CDDL") (collectively, the "License").  You
-# may not use this file except in compliance with the License.  You can
-# obtain a copy of the License at
-# https://oss.oracle.com/licenses/CDDL+GPL-1.1
-# or LICENSE.txt.  See the License for the specific
-# language governing permissions and limitations under the License.
-#
-# When distributing the software, include this License Header Notice in each
-# file and include the License file at LICENSE.txt.
-#
-# GPL Classpath Exception:
-# Oracle designates this particular file as subject to the "Classpath"
-# exception as provided by Oracle in the GPL Version 2 section of the License
-# file that accompanied this code.
-#
-# Modifications:
-# If applicable, add the following below the License Header, with the fields
-# enclosed by brackets [] replaced by your own identifying information:
-# "Portions Copyright [year] [name of copyright owner]"
-#
-# Contributor(s):
-# If you wish your version of this file to be governed by only the CDDL or
-# only the GPL Version 2, indicate your decision by adding "[Contributor]
-# elects to include this software in this distribution under the [CDDL or GPL
-# Version 2] license."  If you don't indicate a single choice of license, a
-# recipient has the option to distribute your version of this file under
-# either the CDDL, the GPL Version 2 or to extend the choice of license to
-# its licensees as provided above.  However, if you add GPL Version 2 code
-# and therefore, elected the GPL Version 2 license, then the option applies
-# only if the new code is made subject to such option by the copyright
-# holder.
-#
-
-internal.error=Internal Error
-
-parser.getString.err=JsonParser#getString() is valid only for KEY_NAME, VALUE_STRING, VALUE_NUMBER parser states. \
-  But current parser state is {0}
-parser.isIntegralNumber.err=JsonParser#isIntegralNumber() is valid only for VALUE_NUMBER parser state. \
-  But current parser state is {0}
-parser.getInt.err=JsonParser#getInt() is valid only for VALUE_NUMBER parser state. \
-  But current parser state is {0}
-parser.getLong.err=JsonParser#getLong() is valid only for VALUE_NUMBER parser state. \
-  But current parser state is {0}
-parser.getBigDecimal.err=JsonParser#getBigDecimal() is valid only for VALUE_NUMBER parser state. \
-  But current parser state is {0}
-parser.getArray.err=JsonParser#getArray() or JsonParser#getArrayStream() is valid only for START_ARRAY parser state. \
-  But current parser state is {0}
-parser.getObject.err=JsonParser#getObject() or JsonParser#getObjectStream() is valid only for START_OBJECT parser state. \
-  But current parser state is {0}
-parser.getValue.err=JsonParser#getValue() is valid only for START_ARRAY, START_OBJECT, KEY_NAME, VALUE_STRING, VALUE_NUMBER, VALUE_NULL, VALUE_FALSE, VALUE_TRUE parser states. \
-  But current parser state is {0}
-parser.getValueStream.err=JsonParser#getValueStream() the parser must not be in an array or object. \
-  But current parser state is {0}
-parser.expected.eof=Expected EOF token, but got {0}
-parser.tokenizer.close.io=I/O error while closing JSON tokenizer
-parser.invalid.token=Invalid token={0} at {1}. Expected tokens are: {2}
-parser.state.err=Unknown value type {0}
-parser.scope.err=Cannot be called for value {0}
-parser.input.enc.detect.failed=Cannot auto-detect encoding, not enough chars
-parser.input.enc.detect.ioerr=I/O error while auto-detecting the encoding of stream
-
-generator.flush.io.err=I/O error while flushing generated JSON
-generator.close.io.err=I/O error while closing JsonGenerator
-generator.write.io.err=I/O error while writing in JsonGenerator
-generator.illegal.method=Illegal method during JSON generation, \
-  not valid in current context {0}
-generator.double.infinite.nan=double value cannot be Infinite or NaN
-generator.incomplete.json=Generating incomplete JSON
-generator.illegal.multiple.text=Cannot generate more than one JSON text
-
-writer.write.already.called=write/writeObject/writeArray/close method is already called
-
-reader.read.already.called=read/readObject/readArray/close method is already called
-
-objbuilder.name.null=Name in JsonObject's name/value pair cannot be null
-objbuilder.value.null=Value in JsonObject's name/value pair cannot be null
-objbuilder.object.builder.null=Object builder that is used to create a value in JsonObject's name/value pair cannot be null
-objbuilder.array.builder.null=Array builder that is used to create a value in JsonObject's name/value pair cannot be null
-
-arrbuilder.value.null=Cannot invoke add(null) while building JsonArray.
-arrbuilder.object.builder.null=Object builder that is used to add a value to JSON array cannot be null
-arrbuilder.array.builder.null=Array builder that is used to add a value to JSON array cannot be null
-arrbuilder.valuelist.null=Index: {0}, Size: {1}
-
-tokenizer.unexpected.char=Unexpected char {0} at {1}
-tokenizer.expected.char=Unexpected char {0} at {1}, expecting ''{2}''
-tokenizer.io.err=I/O error while parsing JSON
-
-pointer.format.invalid=A non-empty JSON Pointer must begin with a ''/''
-pointer.mapping.missing=The JSON Object ''{0}'' contains no mapping for the name ''{1}''
-pointer.reference.invalid=The reference value in a JSON Pointer must be a JSON Object or a JSON Array, was ''{0}''
-pointer.array.index.err=Array index format error, was ''{0}''
-pointer.array.index.illegal=Illegal integer format, was ''{0}''
-
-noderef.value.add.err=The root value only allows adding a JSON object or array
-noderef.value.cannot.remove=The JSON value at the root cannot be removed
-noderef.object.missing=Non-existing name/value pair in the object for key {0}
-noderef.array.index.err=An array item index is out of range. Index: {0}, Size: {1}
-
-patch.must.be.array=A JSON Patch must be an array of JSON Objects
-patch.move.proper.prefix=The ''{0}'' path of the patch operation ''move'' is a proper prefix of the ''{1}'' path
-patch.move.target.null=The ''{0}'' path of the patch operation ''move'' does not exist in target object
-patch.test.failed=The JSON Patch operation ''test'' failed for path ''{0}'' and value ''{1}''
-patch.illegal.operation=Illegal value for the op member of the JSON Patch operation: ''{0}''
-patch.member.missing=The JSON Patch operation ''{0}'' must contain a ''{1}'' member
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 77e9940..5c6107e 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -8,17 +8,16 @@ import java.awt.GraphicsEnvironment;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -409,23 +408,13 @@ public abstract class Main {
      * explicitly removing the listeners and allows us to transparently register every
      * created dataset as projection change listener.
      */
-    private static final List<WeakReference<ProjectionChangeListener>> listeners = new ArrayList<>();
+    private static final List<WeakReference<ProjectionChangeListener>> listeners = new CopyOnWriteArrayList<>();
 
     private static void fireProjectionChanged(Projection oldValue, Projection newValue, Bounds oldBounds) {
         if ((newValue == null ^ oldValue == null)
                 || (newValue != null && oldValue != null && !Objects.equals(newValue.toCode(), oldValue.toCode()))) {
-            synchronized (Main.class) {
-                Iterator<WeakReference<ProjectionChangeListener>> it = listeners.iterator();
-                while (it.hasNext()) {
-                    WeakReference<ProjectionChangeListener> wr = it.next();
-                    ProjectionChangeListener listener = wr.get();
-                    if (listener == null) {
-                        it.remove();
-                        continue;
-                    }
-                    listener.projectionChanged(oldValue, newValue);
-                }
-            }
+            listeners.removeIf(x -> x.get() == null);
+            listeners.stream().map(WeakReference::get).filter(Objects::nonNull).forEach(x -> x.projectionChanged(oldValue, newValue));
             if (newValue != null && oldBounds != null && main != null) {
                 main.restoreOldBounds(oldBounds);
             }
@@ -441,13 +430,11 @@ public abstract class Main {
      */
     public static void addProjectionChangeListener(ProjectionChangeListener listener) {
         if (listener == null) return;
-        synchronized (Main.class) {
-            for (WeakReference<ProjectionChangeListener> wr : listeners) {
-                // already registered ? => abort
-                if (wr.get() == listener) return;
-            }
-            listeners.add(new WeakReference<>(listener));
+        for (WeakReference<ProjectionChangeListener> wr : listeners) {
+            // already registered ? => abort
+            if (wr.get() == listener) return;
         }
+        listeners.add(new WeakReference<>(listener));
     }
 
     /**
@@ -457,11 +444,16 @@ public abstract class Main {
      */
     public static void removeProjectionChangeListener(ProjectionChangeListener listener) {
         if (listener == null) return;
-        synchronized (Main.class) {
-            // remove the listener - and any other listener which got garbage
-            // collected in the meantime
-            listeners.removeIf(wr -> wr.get() == null || wr.get() == listener);
-        }
+        // remove the listener - and any other listener which got garbage collected in the meantime
+        listeners.removeIf(wr -> wr.get() == null || wr.get() == listener);
+    }
+
+    /**
+     * Remove all projection change listeners. For testing purposes only.
+     * @since 13322
+     */
+    public static void clearProjectionChangeListeners() {
+        listeners.clear();
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/actions/CloseChangesetAction.java b/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
index 675a93f..2649b80 100644
--- a/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
+++ b/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
@@ -142,10 +142,18 @@ public class CloseChangesetAction extends JosmAction {
             }
         }
 
+        /**
+         * Determines if the download task has been canceled.
+         * @return {@code true} if the download task has been canceled
+         */
         public boolean isCanceled() {
             return canceled;
         }
 
+        /**
+         * Returns the last exception that occured.
+         * @return the last exception that occured, or {@code null}
+         */
         public Exception getLastException() {
             return lastException;
         }
diff --git a/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java b/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
index 8cd04f9..452283f 100644
--- a/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
+++ b/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
@@ -102,6 +102,7 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
                 org.openstreetmap.josm.gui.io.importexport.OsmExporter.class,
                 org.openstreetmap.josm.gui.io.importexport.OsmGzipExporter.class,
                 org.openstreetmap.josm.gui.io.importexport.OsmBzip2Exporter.class,
+                org.openstreetmap.josm.gui.io.importexport.OsmXzExporter.class,
                 org.openstreetmap.josm.gui.io.importexport.GeoJSONExporter.class,
                 org.openstreetmap.josm.gui.io.importexport.WMSLayerExporter.class,
                 org.openstreetmap.josm.gui.io.importexport.NoteExporter.class,
@@ -139,7 +140,17 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
         );
     }
 
-    public enum AddArchiveExtension { NONE, BASE, ALL }
+    /**
+     * Strategy to determine if extensions must be added to the description.
+     */
+    public enum AddArchiveExtension {
+        /** No extension is added */
+        NONE,
+        /** Only base extension is added */
+        BASE,
+        /** All extensions are added (base + archives) */
+        ALL
+    }
 
     /**
      * Adds a new file importer at the end of the global list. This importer will be evaluated after core ones.
@@ -399,7 +410,7 @@ public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte
     public static ExtensionFileFilter newFilterWithArchiveExtensions(
             String extensions, String defaultExtension, String description, boolean addArchiveExtensionsToDescription) {
 
-        List<String> archiveExtensions = Arrays.asList("gz", "bz2");
+        List<String> archiveExtensions = Arrays.asList("gz", "bz", "bz2", "xz", "zip");
         return newFilterWithArchiveExtensions(
             extensions,
             defaultExtension,
diff --git a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
index 44e244d..64a030b 100644
--- a/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
+++ b/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
@@ -14,8 +14,6 @@ import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.util.Formatter;
 import java.util.Locale;
 
@@ -153,6 +151,12 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
         case KeyEvent.VK_DOWN : dy = -1; break;
         case KeyEvent.VK_LEFT : dx = -1; break;
         case KeyEvent.VK_RIGHT : dx = +1; break;
+        case KeyEvent.VK_ESCAPE:
+            if (offsetDialog != null) {
+                offsetDialog.setVisible(false);
+                return;
+            }
+            break;
         default: // Do nothing
         }
         if (dx != 0 || dy != 0) {
@@ -225,7 +229,7 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
             super(Main.parent,
                     tr("Adjust imagery offset"),
                     new String[] {tr("OK"), tr("Cancel")},
-                    false);
+                    false, false); // Do not dispose on close, so HIDE_ON_CLOSE remains the default behaviour and setVisible is called
             setButtonIcons("ok", "cancel");
             contentInsets = new Insets(10, 15, 5, 15);
             JPanel pnl = new JPanel(new GridBagLayout());
@@ -242,7 +246,6 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
             tOffset.addFocusListener(this);
             setContent(pnl);
             setupDialog();
-            addWindowListener(new WindowEventHandler());
             setRememberWindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(Main.parent, getSize()));
         }
 
@@ -274,9 +277,7 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
                 }
             }
             updateOffsetIntl();
-            if (MainApplication.isDisplayingMapView()) {
-                MainApplication.getMap().repaint();
-            }
+            layer.invalidate();
         }
 
         private void updateOffset() {
@@ -322,7 +323,6 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
                 return;
             }
             super.buttonAction(buttonIndex, evt);
-            restoreMapModeState();
         }
 
         @Override
@@ -330,6 +330,7 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
             super.setVisible(visible);
             if (visible)
                 return;
+            ignoreListener = true;
             offsetDialog = null;
             if (layer != null) {
                 if (getValue() != 1) {
@@ -339,6 +340,7 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
                 }
             }
             MainApplication.getMenu().imageryMenu.refreshOffsetMenu();
+            restoreMapModeState();
         }
 
         private void restoreMapModeState() {
@@ -348,16 +350,9 @@ public class ImageryAdjustAction extends MapMode implements AWTEventListener {
             if (oldMapMode != null) {
                 map.selectMapMode(oldMapMode);
                 oldMapMode = null;
-            } else {
-                map.selectSelectTool(false);
-            }
-        }
-
-        class WindowEventHandler extends WindowAdapter {
-            @Override
-            public void windowClosing(WindowEvent e) {
-                setVisible(false);
-                restoreMapModeState();
+            } else if (!map.selectSelectTool(false)) {
+                exitMode();
+                map.mapMode = null;
             }
         }
     }
diff --git a/src/org/openstreetmap/josm/actions/MoveAction.java b/src/org/openstreetmap/josm/actions/MoveAction.java
index 89a13dd..a33a0fc 100644
--- a/src/org/openstreetmap/josm/actions/MoveAction.java
+++ b/src/org/openstreetmap/josm/actions/MoveAction.java
@@ -151,7 +151,7 @@ public class MoveAction extends JosmAction {
         }
 
         for (Node n : affectedNodes) {
-            if (n.getCoor().isOutSideWorld()) {
+            if (n.isLatLonKnown() && n.getCoor().isOutSideWorld()) {
                 // Revert move
                 ((MoveCommand) c).moveAgain(-distx, -disty);
                 JOptionPane.showMessageDialog(
diff --git a/src/org/openstreetmap/josm/actions/OpenLocationAction.java b/src/org/openstreetmap/josm/actions/OpenLocationAction.java
index f4ef604..feb179a 100644
--- a/src/org/openstreetmap/josm/actions/OpenLocationAction.java
+++ b/src/org/openstreetmap/josm/actions/OpenLocationAction.java
@@ -138,7 +138,7 @@ public class OpenLocationAction extends JosmAction {
         all.add(uploadAddresses, GBC.eop().fill(GBC.BOTH));
 
         // use separate layer
-        JCheckBox layer = new JCheckBox(tr("Separate Layer"));
+        JCheckBox layer = new JCheckBox(tr("Download as new layer"));
         layer.setToolTipText(tr("Select if the data should be downloaded into a new layer"));
         layer.setSelected(USE_NEW_LAYER.get());
         all.add(layer, GBC.eop().fill(GBC.BOTH));
diff --git a/src/org/openstreetmap/josm/actions/SaveAction.java b/src/org/openstreetmap/josm/actions/SaveAction.java
index 4f08eb1..3a57c70 100644
--- a/src/org/openstreetmap/josm/actions/SaveAction.java
+++ b/src/org/openstreetmap/josm/actions/SaveAction.java
@@ -30,6 +30,10 @@ public final class SaveAction extends SaveActionBase {
         putValue("help", ht("/Action/Save"));
     }
 
+    /**
+     * Returns the unique instance.
+     * @return the unique instance
+     */
     public static SaveAction getInstance() {
         return instance;
     }
diff --git a/src/org/openstreetmap/josm/actions/SaveAsAction.java b/src/org/openstreetmap/josm/actions/SaveAsAction.java
index 02d8c01..5f257d7 100644
--- a/src/org/openstreetmap/josm/actions/SaveAsAction.java
+++ b/src/org/openstreetmap/josm/actions/SaveAsAction.java
@@ -28,6 +28,10 @@ public class SaveAsAction extends SaveActionBase {
         putValue("help", ht("/Action/SaveAs"));
     }
 
+    /**
+     * Returns the unique instance.
+     * @return the unique instance
+     */
     public static SaveAsAction getInstance() {
         return instance;
     }
diff --git a/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java b/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
index 25ccebc..cdc79bd 100644
--- a/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
+++ b/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
@@ -124,7 +124,7 @@ public class UnJoinNodeWayAction extends JosmAction {
         // If exactly one selected way, remove node not referencing par this way.
         if (selectedWays.size() == 1) {
             Way w = selectedWays.get(0);
-            for (Node n: new ArrayList<Node>(resultingNodes)) {
+            for (Node n: new ArrayList<>(resultingNodes)) {
                 if (!w.containsNode(n)) {
                     resultingNodes.remove(n);
                 }
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
index 6caec66..1780d8c 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
@@ -26,6 +26,7 @@ import org.openstreetmap.josm.gui.layer.NoteLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.BoundingBoxDownloader;
 import org.openstreetmap.josm.io.BoundingBoxDownloader.MoreNotesException;
+import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmServerLocationReader;
 import org.openstreetmap.josm.io.OsmServerLocationReader.NoteUrlPattern;
@@ -47,6 +48,8 @@ public class DownloadNotesTask extends AbstractDownloadTask<NoteData> {
     /** Property defining number of days a bug needs to be closed to no longer be downloaded */
     public static final IntegerProperty DAYS_CLOSED = new IntegerProperty("osm.notes.daysClosed", 7);
 
+    private static final String PATTERN_COMPRESS = "https?://.*/(.*\\.osn.(gz|xz|bz2?|zip))";
+
     private DownloadTask downloadTask;
     private NoteLayer noteLayer;
 
@@ -70,8 +73,8 @@ public class DownloadNotesTask extends AbstractDownloadTask<NoteData> {
 
     @Override
     public Future<?> loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor) {
-        if (url.endsWith(".bz2")) {
-            downloadTask = new DownloadBzip2RawUrlTask(new OsmServerLocationReader(url), progressMonitor);
+        if (url.matches(PATTERN_COMPRESS)) {
+            downloadTask = new DownloadCompressedRawUrlTask(new OsmServerLocationReader(url), progressMonitor, Compression.byExtension(url));
         } else {
             downloadTask = new DownloadRawUrlTask(new OsmServerLocationReader(url), progressMonitor);
         }
@@ -209,10 +212,13 @@ public class DownloadNotesTask extends AbstractDownloadTask<NoteData> {
         }
     }
 
-    class DownloadBzip2RawUrlTask extends DownloadTask {
+    class DownloadCompressedRawUrlTask extends DownloadTask {
+
+        private final Compression compression;
 
-        DownloadBzip2RawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor) {
+        DownloadCompressedRawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor, Compression compression) {
             super(reader, progressMonitor);
+            this.compression = compression;
         }
 
         @Override
@@ -222,7 +228,7 @@ public class DownloadNotesTask extends AbstractDownloadTask<NoteData> {
             }
             ProgressMonitor subMonitor = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
             try {
-                notesData = reader.parseRawNotesBzip2(subMonitor);
+                notesData = reader.parseRawNotes(subMonitor, compression);
             } catch (OsmTransferException e) {
                 if (isCanceled())
                     return;
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java
index c0c0807..b137f1d 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeCompressedTask.java
@@ -8,18 +8,21 @@ import java.util.concurrent.Future;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.OsmServerLocationReader;
 import org.openstreetmap.josm.io.OsmTransferException;
 
 /**
- * Task allowing to download compressed OSM-Change files (gzip and bzip2)
+ * Task allowing to download compressed OSM-Change files (gzip, xz and bzip2)
  * @since 5361
  */
 public class DownloadOsmChangeCompressedTask extends DownloadOsmChangeTask {
 
+    private static final String PATTERN_COMPRESS = "https?://.*/(.*\\.osc.(gz|xz|bz2?|zip))";
+
     @Override
     public String[] getPatterns() {
-        return new String[]{"https?://.*/.*\\.osc.(gz|bz2?)"};
+        return new String[]{PATTERN_COMPRESS};
     }
 
     @Override
@@ -39,16 +42,12 @@ public class DownloadOsmChangeCompressedTask extends DownloadOsmChangeTask {
             @Override
             protected DataSet parseDataSet() throws OsmTransferException {
                 ProgressMonitor subTaskMonitor = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
-                if (url.matches("https?://.*/.*\\.osc.bz2?")) {
-                    return reader.parseOsmChangeBzip2(subTaskMonitor);
-                } else {
-                    return reader.parseOsmChangeGzip(subTaskMonitor);
-                }
+                return reader.parseOsmChange(subTaskMonitor, Compression.byExtension(url));
             }
         };
         currentBounds = null;
-        // Extract .osc.gz/bz/bz2 filename from URL to set the new layer name
-        extractOsmFilename("https?://.*/(.*\\.osc.(gz|bz2?))", url);
+        // Extract .osc.gz/xz/bz/bz2/zip filename from URL to set the new layer name
+        extractOsmFilename(PATTERN_COMPRESS, url);
         return MainApplication.worker.submit(downloadTask);
     }
 }
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java
index 68c4000..a1e26da 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java
@@ -9,16 +9,17 @@ import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.Compression;
 import org.openstreetmap.josm.io.OsmServerLocationReader;
 import org.openstreetmap.josm.io.OsmTransferException;
 
 /**
- * Task allowing to download compressed OSM files (gzip and bzip2)
+ * Task allowing to download compressed OSM files (gzip, xz and bzip2)
  * @since 5317
  */
 public class DownloadOsmCompressedTask extends DownloadOsmTask {
 
-    private static final String PATTERN_COMPRESS = "https?://.*/.*\\.osm.(gz|bz2?|zip)";
+    private static final String PATTERN_COMPRESS = "https?://.*/(.*\\.osm\\.(gz|xz|bz2?|zip))";
 
     @Override
     public String[] getPatterns() {
@@ -31,8 +32,7 @@ public class DownloadOsmCompressedTask extends DownloadOsmTask {
     }
 
     @Override
-    public Future<?> download(boolean newLayer, Bounds downloadArea,
-            ProgressMonitor progressMonitor) {
+    public Future<?> download(boolean newLayer, Bounds downloadArea, ProgressMonitor progressMonitor) {
         return null;
     }
 
@@ -48,18 +48,12 @@ public class DownloadOsmCompressedTask extends DownloadOsmTask {
             @Override
             protected DataSet parseDataSet() throws OsmTransferException {
                 ProgressMonitor subTaskMonitor = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false);
-                if (url.matches("https?://.*/.*\\.osm.bz2?")) {
-                    return reader.parseOsmBzip2(subTaskMonitor);
-                } else if (url.matches("https?://.*/.*\\.osm.gz")) {
-                    return reader.parseOsmGzip(subTaskMonitor);
-                } else {
-                    return reader.parseOsmZip(subTaskMonitor);
-                }
+                return reader.parseOsm(subTaskMonitor, Compression.byExtension(url));
             }
         };
         currentBounds = null;
         // Extract .osm.gz/bz/bz2/zip filename from URL to set the new layer name
-        extractOsmFilename("https?://.*/(.*\\.osm.(gz|bz2?|zip))", url);
+        extractOsmFilename(PATTERN_COMPRESS, url);
         return MainApplication.worker.submit(downloadTask);
     }
 }
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
index 9c46c20..714877a 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
@@ -198,9 +198,10 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
 
     /**
      * Checks if a map redraw is required and does so if needed. Also updates the status bar.
+     * @param e event, can be null
      * @return true if a repaint is needed
      */
-    private boolean redrawIfRequired() {
+    private boolean redrawIfRequired(Object e) {
         updateStatusLine();
         // repaint required if the helper line is active.
         boolean needsRepaint = DRAW_HELPER_LINE.get() && !wayIsFinished;
@@ -235,11 +236,16 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
                 addRemoveSelection(currentDataSet, baseNode, continueFrom);
                 needsRepaint = true;
             } else if (!alt && continueFrom != null && !continueFrom.isSelected()) {
-                currentDataSet.addSelected(continueFrom);
+                addSelection(currentDataSet, continueFrom);
                 needsRepaint = true;
             }
         }
 
+        if (!needsRepaint && e instanceof SelectionChangeEvent) {
+            SelectionChangeEvent event = (SelectionChangeEvent) e;
+            needsRepaint = !event.getOldSelection().isEmpty() && event.getSelection().isEmpty();
+        }
+
         if (needsRepaint && editLayer != null) {
             editLayer.invalidate();
         }
@@ -249,13 +255,43 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
     private static void addRemoveSelection(DataSet ds, OsmPrimitive toAdd, OsmPrimitive toRemove) {
         ds.beginUpdate(); // to prevent the selection listener to screw around with the state
         try {
-            ds.addSelected(toAdd);
-            ds.clearSelection(toRemove);
+            addSelection(ds, toAdd);
+            clearSelection(ds, toRemove);
         } finally {
             ds.endUpdate();
         }
     }
 
+    private static void updatePreservedFlag(OsmPrimitive osm, boolean state) {
+        // Preserves selected primitives and selected way nodes
+        osm.setPreserved(state);
+        if (osm instanceof Way) {
+            for (Node n : ((Way) osm).getNodes()) {
+                n.setPreserved(state);
+            }
+        }
+    }
+
+    private static void setSelection(DataSet ds, Collection<OsmPrimitive> toSet) {
+        toSet.stream().forEach(x -> updatePreservedFlag(x, true));
+        ds.setSelected(toSet);
+    }
+
+    private static void setSelection(DataSet ds, OsmPrimitive toSet) {
+        updatePreservedFlag(toSet, true);
+        ds.setSelected(toSet);
+    }
+
+    private static void addSelection(DataSet ds, OsmPrimitive toAdd) {
+        updatePreservedFlag(toAdd, true);
+        ds.addSelected(toAdd);
+    }
+
+    private static void clearSelection(DataSet ds, OsmPrimitive toRemove) {
+        ds.clearSelection(toRemove);
+        updatePreservedFlag(toRemove, false);
+    }
+
     @Override
     public void enterMode() {
         if (!isEnabled())
@@ -302,7 +338,12 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
         map.statusLine.getAnglePanel().removeMouseListener(snapHelper.anglePopupListener);
         map.statusLine.activateAnglePanel(false);
 
-        removeHighlighting();
+        DataSet ds = getLayerManager().getEditDataSet();
+        if (ds != null) {
+            ds.getSelected().stream().forEach(x -> updatePreservedFlag(x, false));
+        }
+
+        removeHighlighting(null);
         map.keyDetector.removeKeyListener(this);
         map.keyDetector.removeModifierExListener(this);
     }
@@ -316,7 +357,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
             return;
         updateKeyModifiersEx(modifiers);
         computeHelperLine();
-        addHighlighting();
+        addHighlighting(null);
     }
 
     @Override
@@ -325,7 +366,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
             return;
         snapHelper.setFixedMode();
         computeHelperLine();
-        redrawIfRequired();
+        redrawIfRequired(e);
     }
 
     @Override
@@ -338,7 +379,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
         }
         snapHelper.unFixOrTurnOff();
         computeHelperLine();
-        redrawIfRequired();
+        redrawIfRequired(e);
     }
 
     /**
@@ -350,13 +391,17 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
             return;
         // Make sure helper line is computed later (causes deadlock in selection event chain otherwise)
         SwingUtilities.invokeLater(() -> {
-            computeHelperLine();
-            addHighlighting();
+            event.getOldSelection().stream().forEach(x -> updatePreservedFlag(x, false));
+            event.getSelection().stream().forEach(x -> updatePreservedFlag(x, true));
+            if (MainApplication.getMap() != null) {
+                computeHelperLine();
+                addHighlighting(event);
+            }
         });
     }
 
     private void tryAgain(MouseEvent e) {
-        getLayerManager().getEditDataSet().setSelected();
+        getLayerManager().getEditDataSet().clearSelection();
         mouseReleased(e);
     }
 
@@ -373,7 +418,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
 
         // Redraw to remove the helper line stub
         computeHelperLine();
-        removeHighlighting();
+        removeHighlighting(null);
     }
 
     @Override
@@ -444,11 +489,11 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
                 // (this is just a convenience option so that people don't
                 // have to switch modes)
 
-                ds.setSelected(n);
+                setSelection(ds, n);
                 // If we extend/continue an existing way, select it already now to make it obvious
                 Way continueFrom = getWayForNode(n);
                 if (continueFrom != null) {
-                    ds.addSelected(continueFrom);
+                    addSelection(ds, continueFrom);
                 }
 
                 // The user explicitly selected a node, so let him continue drawing
@@ -626,7 +671,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
             lastUsedNode = n;
         }
 
-        ds.setSelected(newSelection);
+        setSelection(ds, newSelection);
 
         // "viewport following" mode for tracing long features
         // from aerial imagery or GPS tracks.
@@ -634,7 +679,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
             mapView.smoothScrollTo(n.getEastNorth());
         }
         computeHelperLine();
-        removeHighlighting();
+        removeHighlighting(e);
     }
 
     private static String getTitle(boolean newNode, Node n, Collection<OsmPrimitive> newSelection, List<Way> reuseWays,
@@ -729,7 +774,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
             if ((posn0 != -1 && // n0 is part of way
                 (posn0 >= 1                            && targetNode.equals(selectedWay.getNode(posn0-1)))) || // previous node
                 (posn0 < selectedWay.getNodesCount()-1 && targetNode.equals(selectedWay.getNode(posn0+1)))) {  // next node
-                getLayerManager().getEditDataSet().setSelected(targetNode);
+                setSelection(getLayerManager().getEditDataSet(), targetNode);
                 lastUsedNode = targetNode;
                 return true;
             }
@@ -788,7 +833,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
             tryToSetBaseSegmentForAngleSnap();
 
         computeHelperLine();
-        addHighlighting();
+        addHighlighting(e);
     }
 
     /**
@@ -816,7 +861,8 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
             return;
         }
 
-        Collection<OsmPrimitive> selection = getLayerManager().getEditDataSet().getSelected();
+        DataSet ds = getLayerManager().getEditDataSet();
+        Collection<OsmPrimitive> selection = ds != null ? ds.getSelected() : Collections.emptyList();
 
         MapView mv = MainApplication.getMap().mapView;
         Node currentMouseNode = null;
@@ -959,7 +1005,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
             return;
         mousePos = e.getPoint();
         snapHelper.noSnapNow();
-        boolean repaintIssued = removeHighlighting();
+        boolean repaintIssued = removeHighlighting(e);
         // force repaint in case snapHelper needs one. If removeHighlighting
         // caused one already, don't do it again.
         if (!repaintIssued) {
@@ -1121,15 +1167,16 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
      * The status bar derives its information from oldHighlights, so in order to update the status
      * bar both addHighlighting() and repaintIfRequired() are needed, since former fills newHighlights
      * and latter processes them into oldHighlights.
+     * @param event event, can be null
      */
-    private void addHighlighting() {
+    private void addHighlighting(Object event) {
         newHighlights = new HashSet<>();
         MapView mapView = MainApplication.getMap().mapView;
 
         // if ctrl key is held ("no join"), don't highlight anything
         if (ctrl) {
             mapView.setNewCursor(cursor, this);
-            redrawIfRequired();
+            redrawIfRequired(event);
             return;
         }
 
@@ -1141,29 +1188,30 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
         if (mouseOnExistingNode != null) {
             mapView.setNewCursor(cursorJoinNode, this);
             newHighlights.add(mouseOnExistingNode);
-            redrawIfRequired();
+            redrawIfRequired(event);
             return;
         }
 
         // Insert the node into all the nearby way segments
         if (mouseOnExistingWays.isEmpty()) {
             mapView.setNewCursor(cursor, this);
-            redrawIfRequired();
+            redrawIfRequired(event);
             return;
         }
 
         mapView.setNewCursor(cursorJoinWay, this);
         newHighlights.addAll(mouseOnExistingWays);
-        redrawIfRequired();
+        redrawIfRequired(event);
     }
 
     /**
      * Removes target highlighting from primitives. Issues repaint if required.
+     * @param event event, can be null
      * @return true if a repaint has been issued.
      */
-    private boolean removeHighlighting() {
+    private boolean removeHighlighting(Object event) {
         newHighlights = new HashSet<>();
-        return redrawIfRequired();
+        return redrawIfRequired(event);
     }
 
     @Override
@@ -1309,19 +1357,17 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
         return ds.getSelected();
     }
 
+    /**
+     * Gets a collection of primitives that should not be hidden by the filter.
+     * @return The primitives that the filter should not hide.
+     * @deprecated use {@link org.openstreetmap.josm.data.osm.DataSet#allPreservedPrimitives}
+     * @since 11993
+     */
     @Override
+    @Deprecated
     public Collection<? extends OsmPrimitive> getPreservedPrimitives() {
         DataSet ds = getLayerManager().getEditDataSet();
-        if (ds != null) {
-            // Preserves selected primitives and selected way nodes
-            Set<OsmPrimitive> result = new HashSet<>();
-            for (Way w : ds.getSelectedWays()) {
-                result.addAll(w.getNodes());
-            }
-            result.addAll(ds.getSelected());
-            return result;
-        }
-        return Collections.emptySet();
+        return ds != null ? ds.allPreservedPrimitives() : Collections.emptySet();
     }
 
     @Override
@@ -1366,7 +1412,7 @@ public class DrawAction extends MapMode implements MapViewPaintable, DataSelecti
             }
             // select last added node - maybe we will continue drawing from it
             if (n != null) {
-                getLayerManager().getEditDataSet().addSelected(n);
+                addSelection(getLayerManager().getEditDataSet(), n);
             }
         }
     }
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
index 007c84b..771f9fc 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
@@ -61,7 +61,7 @@ import org.openstreetmap.josm.tools.Shortcut;
 public class ImproveWayAccuracyAction extends MapMode implements
         SelectionChangedListener, ModifierExListener {
 
-    private static final String CROSSHAIR = "crosshair";
+    private static final String CROSSHAIR = /* ICON(cursor/)*/ "crosshair";
 
     enum State {
         SELECTING, IMPROVING
@@ -80,13 +80,13 @@ public class ImproveWayAccuracyAction extends MapMode implements
     private Point mousePos;
     private boolean dragging;
 
-    private final Cursor cursorSelect = ImageProvider.getCursor("normal", "mode");
-    private final Cursor cursorSelectHover = ImageProvider.getCursor("hand", "mode");
+    private final Cursor cursorSelect = ImageProvider.getCursor(/* ICON(cursor/)*/ "normal", /* ICON(cursor/modifier/)*/ "mode");
+    private final Cursor cursorSelectHover = ImageProvider.getCursor(/* ICON(cursor/)*/ "hand", /* ICON(cursor/modifier/)*/ "mode");
     private final Cursor cursorImprove = ImageProvider.getCursor(CROSSHAIR, null);
-    private final Cursor cursorImproveAdd = ImageProvider.getCursor(CROSSHAIR, "addnode");
-    private final Cursor cursorImproveDelete = ImageProvider.getCursor(CROSSHAIR, "delete_node");
-    private final Cursor cursorImproveAddLock = ImageProvider.getCursor(CROSSHAIR, "add_node_lock");
-    private final Cursor cursorImproveLock = ImageProvider.getCursor(CROSSHAIR, "lock");
+    private final Cursor cursorImproveAdd = ImageProvider.getCursor(CROSSHAIR, /* ICON(cursor/modifier/)*/ "addnode");
+    private final Cursor cursorImproveDelete = ImageProvider.getCursor(CROSSHAIR, /* ICON(cursor/modifier/)*/ "delete_node");
+    private final Cursor cursorImproveAddLock = ImageProvider.getCursor(CROSSHAIR, /* ICON(cursor/modifier/)*/ "add_node_lock");
+    private final Cursor cursorImproveLock = ImageProvider.getCursor(CROSSHAIR, /* ICON(cursor/modifier/)*/ "lock");
 
     private Color guideColor;
 
diff --git a/src/org/openstreetmap/josm/actions/mapmode/MapMode.java b/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
index eac5e30..bd25bd2 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
@@ -232,8 +232,10 @@ public abstract class MapMode extends JosmAction implements MouseListener, Mouse
     /**
      * Gets a collection of primitives that should not be hidden by the filter.
      * @return The primitives that the filter should not hide.
+     * @deprecated use {@link org.openstreetmap.josm.data.osm.DataSet#allPreservedPrimitives}
      * @since 11993
      */
+    @Deprecated
     public Collection<? extends OsmPrimitive> getPreservedPrimitives() {
         return Collections.emptySet();
     }
diff --git a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
index 384157d..5c19466 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
@@ -71,7 +71,7 @@ import org.openstreetmap.josm.tools.Utils;
  */
 public class SelectAction extends MapMode implements ModifierExListener, KeyPressReleaseListener, SelectionEnded {
 
-    private static final String NORMAL = "normal";
+    private static final String NORMAL = /* ICON(cursor/)*/ "normal";
 
     /**
      * Select action mode.
@@ -91,21 +91,21 @@ public class SelectAction extends MapMode implements ModifierExListener, KeyPres
     // contains all possible cases the cursor can be in the SelectAction
     enum SelectActionCursor {
 
-        rect(NORMAL, "selection"),
-        rect_add(NORMAL, "select_add"),
-        rect_rm(NORMAL, "select_remove"),
-        way(NORMAL, "select_way"),
-        way_add(NORMAL, "select_way_add"),
-        way_rm(NORMAL, "select_way_remove"),
-        node(NORMAL, "select_node"),
-        node_add(NORMAL, "select_node_add"),
-        node_rm(NORMAL, "select_node_remove"),
-        virtual_node(NORMAL, "addnode"),
-        scale("scale", null),
-        rotate("rotate", null),
-        merge("crosshair", null),
-        lasso(NORMAL, "rope"),
-        merge_to_node("crosshair", "joinnode"),
+        rect(NORMAL, /* ICON(cursor/modifier/)*/ "selection"), 
+        rect_add(NORMAL, /* ICON(cursor/modifier/)*/ "select_add"),
+        rect_rm(NORMAL, /* ICON(cursor/modifier/)*/ "select_remove"),
+        way(NORMAL, /* ICON(cursor/modifier/)*/ "select_way"),
+        way_add(NORMAL, /* ICON(cursor/modifier/)*/ "select_way_add"),
+        way_rm(NORMAL, /* ICON(cursor/modifier/)*/ "select_way_remove"),
+        node(NORMAL, /* ICON(cursor/modifier/)*/ "select_node"),
+        node_add(NORMAL, /* ICON(cursor/modifier/)*/ "select_node_add"),
+        node_rm(NORMAL, /* ICON(cursor/modifier/)*/ "select_node_remove"),
+        virtual_node(NORMAL, /* ICON(cursor/modifier/)*/ "addnode"),
+        scale(/* ICON(cursor/)*/ "scale", null), 
+        rotate(/* ICON(cursor/)*/ "rotate", null),
+        merge(/* ICON(cursor/)*/ "crosshair", null),
+        lasso(NORMAL, /* ICON(cursor/modifier/)*/ "rope"), 
+        merge_to_node(/* ICON(cursor/)*/ "crosshair", /* ICON(cursor/modifier/)*/"joinnode"),
         move(Cursor.MOVE_CURSOR);
 
         private final Cursor c;
diff --git a/src/org/openstreetmap/josm/actions/relation/ExportRelationToGpxAction.java b/src/org/openstreetmap/josm/actions/relation/ExportRelationToGpxAction.java
index e105bc8..10703f9 100644
--- a/src/org/openstreetmap/josm/actions/relation/ExportRelationToGpxAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/ExportRelationToGpxAction.java
@@ -101,10 +101,10 @@ public class ExportRelationToGpxAction extends GpxExportAction
     private static String tooltip(EnumSet<Mode> mode) {
         if (mode.contains(FROM_FIRST_MEMBER)) {
             return tr("Flatten this relation to a single gpx track recursively, " +
-                    "starting with the first member(s), successively continuing to the last.");
+                    "starting with the first member, successively continuing to the last.");
         } else {
             return tr("Flatten this relation to a single gpx track recursively, " +
-                    "starting with the last member(s), successively continuing to the first.");
+                    "starting with the last member, successively continuing to the first.");
         }
     }
 
diff --git a/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java b/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java
index 7279150..4f4df50 100644
--- a/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java
@@ -50,12 +50,8 @@ public class RecentRelationsAction extends JosmAction implements CommandQueueLis
         arrow.setToolTipText(tr("List of recent relations"));
         MainApplication.undoRedo.addCommandQueueListener(this);
         enableArrow();
-        shortcut = Shortcut.registerShortcut(
-            "relationeditor:editrecentrelation",
-            tr("Relation Editor: {0}", tr("Open recent relation")),
-            KeyEvent.VK_ESCAPE,
-            Shortcut.SHIFT
-        );
+        shortcut = Shortcut.registerShortcut("relationeditor:editrecentrelation",
+            tr("Relation Editor: {0}", tr("Open recent relation")), KeyEvent.VK_ESCAPE, Shortcut.SHIFT);
         launchAction = new LaunchEditorAction();
         MainApplication.registerActionShortcut(launchAction, shortcut);
     }
diff --git a/src/org/openstreetmap/josm/actions/search/SearchAction.java b/src/org/openstreetmap/josm/actions/search/SearchAction.java
index 49c38dc..51a4f99 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchAction.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchAction.java
@@ -419,7 +419,9 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
                         Logging.debug(e);
                         JOptionPane.showMessageDialog(
                                 Main.parent,
-                                tr("Search expression is not valid: \n\n {0}", e.getMessage()),
+                                "<html>" + tr("Search expression is not valid: \n\n {0}",
+                                        e.getMessage().replace("<html>", "").replace("</html>", "")).replace("\n", "<br>") +
+                                "</html>",
                                 tr("Invalid search expression"),
                                 JOptionPane.ERROR_MESSAGE);
                     }
diff --git a/src/org/openstreetmap/josm/data/Preferences.java b/src/org/openstreetmap/josm/data/Preferences.java
index c668181..d544c74 100644
--- a/src/org/openstreetmap/josm/data/Preferences.java
+++ b/src/org/openstreetmap/josm/data/Preferences.java
@@ -700,21 +700,6 @@ public class Preferences extends AbstractPreferences {
     }
 
     /**
-     * Convenience method for accessing colour preferences.
-     * <p>
-     * To be removed: end of 2016
-     *
-     * @param colName name of the colour
-     * @param def default value
-     * @return a Color object for the configured colour, or the default value if none configured.
-     * @deprecated Use a {@link NamedColorProperty} instead.
-     */
-    @Deprecated
-    public synchronized Color getColor(String colName, Color def) {
-        return getColor(colName, null, def);
-    }
-
-    /**
      * only for preferences
      * @param o color key
      * @return translated color name
@@ -741,32 +726,6 @@ public class Preferences extends AbstractPreferences {
     }
 
     /**
-     * Convenience method for accessing colour preferences.
-     * <p>
-     * To be removed: end of 2016
-     * @param colName name of the colour
-     * @param specName name of the special colour settings
-     * @param def default value
-     * @return a Color object for the configured colour, or the default value if none configured.
-     * @deprecated Use a {@link NamedColorProperty} instead.
-     * You can replace this by: <code>new NamedColorProperty(colName, def).getChildColor(specName)</code>
-     */
-    @Deprecated
-    public synchronized Color getColor(String colName, String specName, Color def) {
-        String colKey = org.openstreetmap.josm.data.preferences.ColorProperty.getColorKey(colName);
-        registerColor(colKey, colName);
-        String colStr = specName != null ? get(COLOR_PREFIX+specName) : "";
-        if (colStr.isEmpty()) {
-            colStr = get(colKey, ColorHelper.color2html(def, true));
-        }
-        if (colStr != null && !colStr.isEmpty()) {
-            return ColorHelper.html2color(colStr);
-        } else {
-            return def;
-        }
-    }
-
-    /**
      * Registers a color name conversion for the global color registry.
      * @param colKey The key
      * @param colName The name of the color.
diff --git a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
index dc66e02..9a4e0f6 100644
--- a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
+++ b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
@@ -16,7 +16,6 @@ import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.apache.commons.jcs.access.behavior.ICacheAccess;
 import org.apache.commons.jcs.engine.behavior.ICacheElement;
@@ -51,14 +50,6 @@ public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements
     // even if the refresh from the server fails.
     protected static final long ABSOLUTE_EXPIRE_TIME_LIMIT = TimeUnit.DAYS.toMillis(365);
 
-    // Pattern to detect Tomcat error message. Be careful with change of format:
-    // CHECKSTYLE.OFF: LineLength
-    // https://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?r1=1740707&r2=1779641&pathrev=1779641&diff_format=h
-    // CHECKSTYLE.ON: LineLength
-    protected static final Pattern TOMCAT_ERR_MESSAGE = Pattern.compile(
-        ".*<p><b>[^<]+</b>[^<]+</p><p><b>[^<]+</b> (?:<u>)?([^<]*)(?:</u>)?</p><p><b>[^<]+</b> (?:<u>)?[^<]*(?:</u>)?</p>.*",
-        Pattern.CASE_INSENSITIVE);
-
     /**
      * maximum download threads that will be started
      */
@@ -369,7 +360,7 @@ public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements
                     try {
                         String data = urlConn.fetchContent();
                         if (!data.isEmpty()) {
-                            Matcher m = TOMCAT_ERR_MESSAGE.matcher(data);
+                            Matcher m = HttpClient.getTomcatErrorMatcher(data);
                             if (m.matches()) {
                                 attributes.setErrorMessage(m.group(1).replace("'", "''"));
                             }
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
index f75a209..9fdf84a 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -513,6 +513,7 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
                 Objects.equals(this.name, other.name) &&
                 Objects.equals(this.id, other.id) &&
                 Objects.equals(this.url, other.url) &&
+                Objects.equals(this.modTileFeatures, other.modTileFeatures) &&
                 Objects.equals(this.bestMarked, other.bestMarked) &&
                 Objects.equals(this.isGeoreferenceValid, other.isGeoreferenceValid) &&
                 Objects.equals(this.cookies, other.cookies) &&
diff --git a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
index 44bb694..a751beb 100644
--- a/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
@@ -170,6 +170,11 @@ public abstract class AbstractPrimitive implements IPrimitive {
     protected static final short FLAG_ANNOTATED = 1 << 12;
 
     /**
+     * Determines if the primitive is preserved from the filter mechanism.
+     */
+    protected static final short FLAG_PRESERVED = 1 << 13;
+
+    /**
      * Put several boolean flags to one short int field to save memory.
      * Other bits of this field are used in subclasses.
      */
diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java
index de085df..bfc4a72 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSet.java
@@ -517,6 +517,16 @@ public final class DataSet extends QuadBucketPrimitiveStore implements Data, Pro
     }
 
     /**
+     * Returns a collection containing all primitives preserved from filtering.
+     * @return A collection containing all primitives preserved from filtering.
+     * @see OsmPrimitive#isPreserved
+     * @since 13309
+     */
+    public Collection<OsmPrimitive> allPreservedPrimitives() {
+        return getPrimitives(OsmPrimitive::isPreserved);
+    }
+
+    /**
      * Adds a primitive to the dataset.
      *
      * @param primitive the primitive.
diff --git a/src/org/openstreetmap/josm/data/osm/FilterMatcher.java b/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
index 7111e16..d1c9291 100644
--- a/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
+++ b/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
@@ -10,8 +10,6 @@ import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler.Not;
 import org.openstreetmap.josm.data.osm.search.SearchMode;
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
-import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -224,9 +222,7 @@ public class FilterMatcher {
     }
 
     private static FilterType test(List<FilterInfo> filters, OsmPrimitive primitive, boolean hidden) {
-        MapFrame map = MainApplication.getMap();
-        if (primitive.isIncomplete() ||
-                (map != null && map.mapMode != null && map.mapMode.getPreservedPrimitives().contains(primitive)))
+        if (primitive.isIncomplete() || primitive.isPreserved())
             return FilterType.NOT_FILTERED;
 
         boolean filtered = false;
diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
index 81c468c..7edea80 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
@@ -427,6 +427,15 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
     }
 
     /**
+     * Set binary property used internally by the filter mechanism.
+     * @param isPreserved new "preserved" flag value
+     * @since 13309
+     */
+    public void setPreserved(boolean isPreserved) {
+        updateFlags(FLAG_PRESERVED, isPreserved);
+    }
+
+    /**
      * Replies true, if this primitive is disabled. (E.g. a filter applies)
      * @return {@code true} if this object has the "disabled" flag enabled
      */
@@ -459,6 +468,15 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
     }
 
     /**
+     * Replies true, if this primitive is preserved from filtering.
+     * @return {@code true} if this object has the "preserved" flag enabled
+     * @since 13309
+     */
+    public boolean isPreserved() {
+        return (flags & FLAG_PRESERVED) != 0;
+    }
+
+    /**
      * Determines if this object is selectable.
      * <p>
      * A primitive can be selected if all conditions are met:
diff --git a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
index 409adaa..a711b54 100644
--- a/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
+++ b/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
@@ -388,11 +388,14 @@ public class QuadBuckets<T extends OsmPrimitive> implements Collection<T> {
     }
 
     @Override
+    @SuppressWarnings("ModifyCollectionInEnhancedForLoop")
     public boolean retainAll(Collection<?> objects) {
         for (T o : this) {
             if (objects.contains(o)) {
                 continue;
             }
+            // In theory this could cause a ConcurrentModificationException
+            // but we never had such bug report in 8 years (since r2263)
             if (!this.remove(o)) {
                 return false;
             }
diff --git a/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java b/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java
index 9cae7a4..edbc44f 100644
--- a/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java
+++ b/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java
@@ -200,11 +200,12 @@ public class SearchCompiler {
                             }
                             return new TimestampRange(minDate, maxDate);
                         } else {
-                            throw new SearchParseError("<html>" + tr("Expecting {0} after {1}", "<i>min</i>/<i>max</i>", "<i>timestamp</i>"));
+                            throw new SearchParseError("<html>" + tr("Expecting {0} after {1}", "<i>min</i>/<i>max</i>", "<i>timestamp</i>")
+                                + "</html>");
                         }
                     }
                 } else {
-                    throw new SearchParseError("<html>" + tr("Expecting {0} after {1}", "<code>:</code>", "<i>" + keyword + "</i>"));
+                    throw new SearchParseError("<html>" + tr("Expecting {0} after {1}", "<code>:</code>", "<i>" + keyword + "</i>") + "</html>");
                 }
             }
             throw new IllegalStateException("Not expecting keyword " + keyword);
diff --git a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
index 097cbff..3456f0a 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
@@ -295,7 +295,7 @@ public final class DomainValidator extends AbstractValidator {
 
     // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
     private static final String[] GENERIC_TLDS = new String[] {
-        // Taken from Version 2017071002, Last Updated Tue Jul 11 07:07:02 2017 UTC
+        // Taken from Version 2018012600, Last Updated Fri Jan 26 07:07:01 2018 UTC
         "aaa", // aaa American Automobile Association, Inc.
         "aarp", // aarp AARP
         "abarth", // abarth Fiat Chrysler Automobiles N.V.
@@ -1248,6 +1248,7 @@ public final class DomainValidator extends AbstractValidator {
         "soy", // soy Charleston Road Registry Inc.
         "space", // space DotSpace Inc.
         "spiegel", // spiegel SPIEGEL-Verlag Rudolf Augstein GmbH & Co. KG
+        "sport", // sport Global Association of International Sports Federations (GAISF)
         "spot", // spot Amazon Registry Services, Inc.
         "spreadbetting", // spreadbetting DOTSPREADBETTING REGISTRY LTD
         "srl", // srl InterNetX Corp.
@@ -1503,6 +1504,7 @@ public final class DomainValidator extends AbstractValidator {
         "xn--nqv7f", // 机构 Public Interest Registry
         "xn--nqv7fs00ema", // 组织机构 Public Interest Registry
         "xn--nyqy26a", // 健康 Stable Tone Limited
+        "xn--otu796d", // 招聘 Dot Trademark TLD Holding Company Limited
         "xn--p1acf", // рус Rusnames Limited
         "xn--pbt977c", // 珠宝 Richemont DNS Inc.
         "xn--pssy2u", // 大拿 VeriSign Sarl
diff --git a/src/org/openstreetmap/josm/data/validation/tests/Highways.java b/src/org/openstreetmap/josm/data/validation/tests/Highways.java
index 3f8000e..19e727a 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/Highways.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/Highways.java
@@ -56,7 +56,8 @@ public class Highways extends Test {
     // CHECKSTYLE.ON: SingleSpaceSeparator
 
     private static final Set<String> KNOWN_SOURCE_MAXSPEED_CONTEXTS = new HashSet<>(Arrays.asList(
-            "urban", "rural", "zone", "zone30", "zone:30", "nsl_single", "nsl_dual", "motorway", "trunk", "living_street", "bicycle_road"));
+            "urban", "rural", "zone", "zone20", "zone:20", "zone30", "zone:30",
+            "nsl_single", "nsl_dual", "motorway", "trunk", "living_street", "bicycle_road"));
 
     private static final Set<String> ISO_COUNTRIES = new HashSet<>(Arrays.asList(Locale.getISOCountries()));
 
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
index 41a0d92..73e720e 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
@@ -60,6 +60,7 @@ import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.AbstractSelector;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
+import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.TokenMgrError;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.UTFInputStreamReader;
@@ -775,7 +776,7 @@ public class MapCSSTagChecker extends Test.TagTest {
             } catch (IOException | IllegalStateException | IllegalArgumentException ex) {
                 Logging.warn(tr("Failed to add {0} to tag checker", i));
                 Logging.log(Logging.LEVEL_WARN, ex);
-            } catch (ParseException ex) {
+            } catch (ParseException | TokenMgrError ex) {
                 Logging.warn(tr("Failed to add {0} to tag checker", i));
                 Logging.warn(ex);
             }
@@ -844,7 +845,7 @@ public class MapCSSTagChecker extends Test.TagTest {
         if (tagChecker != null) {
             try {
                 tagChecker.addMapCSS(rule.url);
-            } catch (IOException | ParseException e) {
+            } catch (IOException | ParseException | TokenMgrError e) {
                 Logging.warn(e);
             }
         }
diff --git a/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
index cca5805..cfc8bf9 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
@@ -11,7 +11,6 @@ import java.util.List;
 
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
 import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -22,6 +21,7 @@ import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
  * Tests the correct usage of the opening hour syntax of the tags
@@ -35,7 +35,7 @@ public class OpeningHourTest extends Test.TagTest {
     /**
      * Javascript engine
      */
-    public static final ScriptEngine ENGINE = new ScriptEngineManager().getEngineByName("JavaScript");
+    public static final ScriptEngine ENGINE = Utils.getJavaScriptEngine();
 
     /**
      * Constructs a new {@code OpeningHourTest}.
@@ -231,14 +231,14 @@ public class OpeningHourTest extends Test.TagTest {
             final Object r = parse(value, key, mode, locale);
             String prettifiedValue = null;
             try {
-                prettifiedValue = (String) ((Invocable) ENGINE).invokeMethod(r, "prettifyValue");
+                prettifiedValue = getOpeningHoursPrettifiedValues(r);
             } catch (ScriptException | NoSuchMethodException e) {
                 Logging.warn(e);
             }
-            for (final Object i : getList(((Invocable) ENGINE).invokeMethod(r, "getErrors"))) {
+            for (final Object i : getOpeningHoursErrors(r)) {
                 errors.add(new OpeningHoursTestError(getErrorMessage(key, i), Severity.ERROR, prettifiedValue));
             }
-            for (final Object i : getList(((Invocable) ENGINE).invokeMethod(r, "getWarnings"))) {
+            for (final Object i : getOpeningHoursWarnings(r)) {
                 errors.add(new OpeningHoursTestError(getErrorMessage(key, i), Severity.WARNING, prettifiedValue));
             }
             if (!ignoreOtherSeverity && errors.isEmpty() && prettifiedValue != null && !value.equals(prettifiedValue)) {
@@ -251,13 +251,49 @@ public class OpeningHourTest extends Test.TagTest {
     }
 
     /**
+     * Returns the prettified value returned by the opening hours parser.
+     * @param r result of {@link #parse}
+     * @return the prettified value returned by the opening hours parser
+     * @throws NoSuchMethodException if method "prettifyValue" or matching argument types cannot be found
+     * @throws ScriptException if an error occurs during invocation of the JavaScript method
+     * @since 13296
+     */
+    public final String getOpeningHoursPrettifiedValues(Object r) throws NoSuchMethodException, ScriptException {
+        return (String) ((Invocable) ENGINE).invokeMethod(r, "prettifyValue");
+    }
+
+    /**
+     * Returns the list of errors returned by the opening hours parser.
+     * @param r result of {@link #parse}
+     * @return the list of errors returned by the opening hours parser
+     * @throws NoSuchMethodException if method "getErrors" or matching argument types cannot be found
+     * @throws ScriptException if an error occurs during invocation of the JavaScript method
+     * @since 13296
+     */
+    public final List<Object> getOpeningHoursErrors(Object r) throws NoSuchMethodException, ScriptException {
+        return getList(((Invocable) ENGINE).invokeMethod(r, "getErrors"));
+    }
+
+    /**
+     * Returns the list of warnings returned by the opening hours parser.
+     * @param r result of {@link #parse}
+     * @return the list of warnings returned by the opening hours parser
+     * @throws NoSuchMethodException if method "getWarnings" or matching argument types cannot be found
+     * @throws ScriptException if an error occurs during invocation of the JavaScript method
+     * @since 13296
+     */
+    public final List<Object> getOpeningHoursWarnings(Object r) throws NoSuchMethodException, ScriptException {
+        return getList(((Invocable) ENGINE).invokeMethod(r, "getWarnings"));
+    }
+
+    /**
      * Translates and shortens the error/warning message.
-     * @param key OSM key
-     * @param o error/warnign message
-     * @return translated/shortened error/warnign message
+     * @param o error/warning message returned by {@link #getOpeningHoursErrors} or {@link #getOpeningHoursWarnings}
+     * @return translated/shortened error/warning message
+     * @since 13298
      */
-    private static String getErrorMessage(String key, Object o) {
-        String msg = o.toString().trim()
+    public static String getErrorMessage(Object o) {
+        return o.toString().trim()
         .replace("Unexpected token:", tr("Unexpected token:"))
         .replace("Unexpected token (school holiday parser):", tr("Unexpected token (school holiday parser):"))
         .replace("Unexpected token in number range:", tr("Unexpected token in number range:"))
@@ -266,7 +302,16 @@ public class OpeningHourTest extends Test.TagTest {
         .replace("Unexpected token in month range:", tr("Unexpected token in month range:"))
         .replace("Unexpected token in year range:", tr("Unexpected token in year range:"))
         .replace("This means that the syntax is not valid at that point or it is currently not supported.", tr("Invalid/unsupported syntax."));
-        return key + " - " + msg;
+    }
+
+    /**
+     * Translates and shortens the error/warning message.
+     * @param key OSM key
+     * @param o error/warning message returned by {@link #getOpeningHoursErrors} or {@link #getOpeningHoursWarnings}
+     * @return translated/shortened error/warning message
+     */
+    static String getErrorMessage(String key, Object o) {
+        return key + " - " + getErrorMessage(o);
     }
 
     protected void check(final OsmPrimitive p, final String key) {
diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
index de9be56..d325a47 100644
--- a/src/org/openstreetmap/josm/gui/MainApplication.java
+++ b/src/org/openstreetmap/josm/gui/MainApplication.java
@@ -155,7 +155,6 @@ import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.FontsManager;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
@@ -954,7 +953,7 @@ public class MainApplication extends Main {
             XMLCommandProcessor config = new XMLCommandProcessor(Main.pref);
             for (String i : args.get(Option.LOAD_PREFERENCES)) {
                 Logging.info("Reading preferences from " + i);
-                try (InputStream is = openStream(new URL(i))) {
+                try (InputStream is = Utils.openStream(new URL(i))) {
                     config.openAndReadXML(is);
                 } catch (IOException ex) {
                     throw BugReport.intercept(ex).put("file", i);
@@ -1208,14 +1207,6 @@ public class MainApplication extends Main {
         }
     }
 
-    private static InputStream openStream(URL url) throws IOException {
-        if ("file".equals(url.getProtocol())) {
-            return url.openStream();
-        } else {
-            return HttpClient.create(url).connect().getContent();
-        }
-    }
-
     static Collection<PluginInformation> updateAndLoadEarlyPlugins(SplashScreen splash, SplashProgressMonitor monitor) {
         Collection<PluginInformation> pluginsToLoad;
         pluginsToLoad = PluginHandler.buildListOfPluginsToLoad(splash, monitor.createSubTaskMonitor(1, false));
@@ -1225,7 +1216,7 @@ public class MainApplication extends Main {
         }
 
         monitor.indeterminateSubTask(tr("Installing updated plugins"));
-        PluginHandler.installDownloadedPlugins(true);
+        PluginHandler.installDownloadedPlugins(pluginsToLoad, true);
 
         monitor.indeterminateSubTask(tr("Loading early plugins"));
         PluginHandler.loadEarlyPlugins(splash, pluginsToLoad, monitor.createSubTaskMonitor(1, false));
diff --git a/src/org/openstreetmap/josm/gui/ScrollViewport.java b/src/org/openstreetmap/josm/gui/ScrollViewport.java
index c8b4ecf..c25c5a7 100644
--- a/src/org/openstreetmap/josm/gui/ScrollViewport.java
+++ b/src/org/openstreetmap/josm/gui/ScrollViewport.java
@@ -127,22 +127,22 @@ public class ScrollViewport extends JPanel {
 
         // UP
         if ((direction & UP_DIRECTION) != 0) {
-            addScrollButton(UP_DIRECTION, "svpUp", BorderLayout.NORTH);
+            addScrollButton(UP_DIRECTION, /* ICON */ "svpUp", BorderLayout.NORTH);
         }
 
         // DOWN
         if ((direction & DOWN_DIRECTION) != 0) {
-            addScrollButton(DOWN_DIRECTION, "svpDown", BorderLayout.SOUTH);
+            addScrollButton(DOWN_DIRECTION, /* ICON */ "svpDown", BorderLayout.SOUTH);
         }
 
         // LEFT
         if ((direction & LEFT_DIRECTION) != 0) {
-            addScrollButton(LEFT_DIRECTION, "svpLeft", BorderLayout.WEST);
+            addScrollButton(LEFT_DIRECTION, /* ICON */ "svpLeft", BorderLayout.WEST);
         }
 
         // RIGHT
         if ((direction & RIGHT_DIRECTION) != 0) {
-            addScrollButton(RIGHT_DIRECTION, "svpRight", BorderLayout.EAST);
+            addScrollButton(RIGHT_DIRECTION, /* ICON */ "svpRight", BorderLayout.EAST);
         }
 
         add(vp, BorderLayout.CENTER);
diff --git a/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java b/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java
index fa2b54c..430e7dc 100644
--- a/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java
+++ b/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java
@@ -245,19 +245,7 @@ public class BugReportDialog extends JDialog {
      * @return The parent frame.
      */
     private static Frame findParent() {
-        Component current = Main.parent;
-        try {
-            // avoid cycles/invalid hirarchies
-            for (int i = 0; i < 20 && current != null; i++) {
-                if (current instanceof Frame) {
-                    return (Frame) current;
-                }
-                current = current.getParent();
-            }
-        } catch (RuntimeException e) { // NOPMD
-            BugReport.intercept(e).put("current", current).warn();
-        }
-        return null;
+        return (Frame) (Main.parent instanceof Frame ? Main.parent : SwingUtilities.getAncestorOfClass(Frame.class, Main.parent));
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
index db3b96e..af27fde 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
@@ -207,7 +207,11 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
             dialog.getConflictResolver().populate(c);
             dialog.showDialog();
 
-            lstConflicts.setSelectedIndex(index);
+            if (index < conflicts.size() - 1) {
+                lstConflicts.setSelectedIndex(index);
+            } else {
+                lstConflicts.setSelectedIndex(index - 1);
+            }
         }
         MainApplication.getMap().mapView.repaint();
     }
@@ -303,7 +307,7 @@ public final class ConflictDialog extends ToggleDialog implements ActiveLayerCha
 
         int index = lstConflicts.getSelectedIndex();
 
-        return index >= 0 ? conflicts.get(index) : null;
+        return index >= 0 && index < conflicts.size() ? conflicts.get(index) : null;
     }
 
     private synchronized boolean isConflictSelected() {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
index bfee31d..faee31d 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
@@ -828,8 +828,6 @@ public class LayerListDialog extends ToggleDialog {
             MapView mapView = MainApplication.getMap().mapView;
             for (int row : sel) {
                 Layer l1 = layers.get(row);
-                Layer l2 = layers.get(row-1);
-                mapView.moveLayer(l2, row);
                 mapView.moveLayer(l1, row-1);
             }
             fireTableDataChanged();
@@ -864,9 +862,7 @@ public class LayerListDialog extends ToggleDialog {
             MapView mapView = MainApplication.getMap().mapView;
             for (int row : sel) {
                 Layer l1 = layers.get(row);
-                Layer l2 = layers.get(row+1);
                 mapView.moveLayer(l1, row+1);
-                mapView.moveLayer(l2, row);
             }
             fireTableDataChanged();
             selectionModel.setValueIsAdjusting(true);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java
index 3201862..5292a0e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java
@@ -38,10 +38,14 @@ public class ChangesetContentTableCellRenderer extends AbstractCellRenderer {
         renderColors(isSelected);
         switch(column) {
         case 0:
-            renderModificationType((ChangesetModificationType) value);
+            if (value instanceof ChangesetModificationType) {
+                renderModificationType((ChangesetModificationType) value);
+            }
             break;
         case 1:
-            renderId(((HistoryOsmPrimitive) value).getId());
+            if (value instanceof HistoryOsmPrimitive) {
+                renderId(((HistoryOsmPrimitive) value).getId());
+            }
             break;
         default:
             /* do nothing */
diff --git a/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java b/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java
index f63e941..f30a52c 100644
--- a/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java
+++ b/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java
@@ -25,7 +25,7 @@ public class DownloadObjectDialog extends OsmIdSelectionDialog {
     // CHECKSTYLE.OFF: SingleSpaceSeparator
     protected final JCheckBox referrers = new JCheckBox(tr("Download referrers (parent relations)"));
     protected final JCheckBox fullRel   = new JCheckBox(tr("Download relation members"));
-    protected final JCheckBox newLayer  = new JCheckBox(tr("Separate Layer"));
+    protected final JCheckBox newLayer  = new JCheckBox(tr("Download as new layer"));
     // CHECKSTYLE.ON: SingleSpaceSeparator
 
     /**
diff --git a/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java b/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java
index ffed4d4..c43902a 100644
--- a/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java
+++ b/src/org/openstreetmap/josm/gui/download/OverpassDownloadSource.java
@@ -191,7 +191,7 @@ public class OverpassDownloadSource implements DownloadSource<OverpassDownloadSo
                 }
             };
 
-            return new OverpassDownloadData(query, errorReporter);
+            return new OverpassDownloadData(OverpassDownloadReader.fixQuery(query), errorReporter);
         }
 
         @Override
diff --git a/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java b/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java
index 788b0cf..8682501 100644
--- a/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java
+++ b/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java
@@ -143,10 +143,8 @@ public final class OverpassQueryWizardDialog extends ExtendedDialog {
      */
     private Optional<String> tryParseSearchTerm(String searchTerm) {
         try {
-            String query = this.overpassQueryBuilder.constructQuery(searchTerm);
-
-            return Optional.of(query);
-        } catch (UncheckedParseException ex) {
+            return Optional.of(overpassQueryBuilder.constructQuery(searchTerm));
+        } catch (UncheckedParseException | IllegalStateException ex) {
             Logging.error(ex);
             JOptionPane.showMessageDialog(
                     dsPanel.getParent(),
@@ -157,7 +155,6 @@ public final class OverpassQueryWizardDialog extends ExtendedDialog {
                     tr("Parse error"),
                     JOptionPane.ERROR_MESSAGE
             );
-
             return Optional.empty();
         }
     }
diff --git a/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java b/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java
index e230d3b..c3ebbba 100644
--- a/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java
+++ b/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java
@@ -25,7 +25,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
@@ -420,7 +419,10 @@ public final class CustomConfigurator {
             try {
                 this.mainPrefs = mainPrefs;
                 PreferencesUtils.resetLog();
-                engine = new ScriptEngineManager().getEngineByName("JavaScript");
+                engine = Utils.getJavaScriptEngine();
+                if (engine == null) {
+                    throw new ScriptException("Failed to retrieve JavaScript engine");
+                }
                 engine.eval("API={}; API.pref={}; API.fragments={};");
 
                 engine.eval("homeDir='"+normalizeDirName(Config.getDirs().getPreferencesDirectory(false).getAbsolutePath()) +"';");
diff --git a/src/org/openstreetmap/josm/gui/io/importexport/NoteImporter.java b/src/org/openstreetmap/josm/gui/io/importexport/NoteImporter.java
index 733c019..f92ec1a 100644
--- a/src/org/openstreetmap/josm/gui/io/importexport/NoteImporter.java
+++ b/src/org/openstreetmap/josm/gui/io/importexport/NoteImporter.java
@@ -19,7 +19,7 @@ import org.openstreetmap.josm.tools.Logging;
 import org.xml.sax.SAXException;
 
 /**
- * File importer that reads note dump files (*.osn, .osn.gz and .osn.bz2)
+ * File importer that reads note dump files (*.osn, .osn.gz, .osn.xz and .osn.bz2)
  * @since 7538
  */
 public class NoteImporter extends FileImporter {
diff --git a/src/org/openstreetmap/josm/gui/io/importexport/OsmExporter.java b/src/org/openstreetmap/josm/gui/io/importexport/OsmExporter.java
index 6238634..380b8a3 100644
--- a/src/org/openstreetmap/josm/gui/io/importexport/OsmExporter.java
+++ b/src/org/openstreetmap/josm/gui/io/importexport/OsmExporter.java
@@ -123,7 +123,7 @@ public class OsmExporter extends FileExporter {
     }
 
     protected void doSave(File file, OsmDataLayer layer) throws IOException {
-        // create outputstream and wrap it with gzip or bzip, if necessary
+        // create outputstream and wrap it with gzip, xz or bzip, if necessary
         try (
             OutputStream out = getOutputStream(file);
             Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8);
diff --git a/src/org/openstreetmap/josm/gui/io/importexport/OsmImporter.java b/src/org/openstreetmap/josm/gui/io/importexport/OsmImporter.java
index b65703a..1fe1dbc 100644
--- a/src/org/openstreetmap/josm/gui/io/importexport/OsmImporter.java
+++ b/src/org/openstreetmap/josm/gui/io/importexport/OsmImporter.java
@@ -32,8 +32,8 @@ public class OsmImporter extends FileImporter {
      * The OSM file filter (*.osm and *.xml files).
      */
     public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
-            "osm,xml", "osm", tr("OSM Server Files") + " (*.osm, *.osm.gz, *.osm.bz2, *.osm.zip, *.xml)",
-            ExtensionFileFilter.AddArchiveExtension.NONE, Arrays.asList("gz", "bz", "bz2", "zip"));
+            "osm,xml", "osm", tr("OSM Server Files") + " (*.osm, *.osm.gz, *.osm.bz2, *.osm.xz, *.osm.zip, *.xml)",
+            ExtensionFileFilter.AddArchiveExtension.NONE, Arrays.asList("gz", "bz", "bz2", "xz", "zip"));
 
     /**
      * Utility class containing imported OSM layer, and a task to run after it is added to MapView.
diff --git a/src/org/openstreetmap/josm/gui/io/importexport/OsmXzExporter.java b/src/org/openstreetmap/josm/gui/io/importexport/OsmXzExporter.java
new file mode 100644
index 0000000..674e5b1
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/io/importexport/OsmXzExporter.java
@@ -0,0 +1,24 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.io.importexport;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
+
+/**
+ * OSM data exporter that compresses it in XZ format.
+ * @since 13352
+ */
+public class OsmXzExporter extends OsmExporter {
+
+    /**
+     * Constructs a new {@code OsmXzExporter}.
+     */
+    public OsmXzExporter() {
+        super(new ExtensionFileFilter(
+            "osm.xz", "osm.xz", tr("OSM Server Files XZ compressed") + " (*.osm.xz)"));
+    }
+
+    // compression handling is performed in super-class
+
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
index df776c2..40d353d 100644
--- a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
@@ -615,8 +615,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
             add(new JSeparator());
             add(new JMenuItem(new LoadTileAction()));
             add(new JMenuItem(new ShowTileInfoAction()));
-            if (ExpertToggleAction.isExpert() && tileSource != null && tileSource.getBaseUrl() != null
-                    && tileSource.getBaseUrl().contains(".tile.openstreetmap.org/")) {
+            if (ExpertToggleAction.isExpert() && tileSource != null && tileSource.isModTileFeatures()) {
                 add(new JMenuItem(new GetOsmTileStatusAction()));
                 add(new JMenuItem(new MarkOsmTileDirtyAction()));
             }
diff --git a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
index fe6e1a4..4186fac 100644
--- a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
@@ -377,7 +377,7 @@ public class GpxLayer extends Layer implements ExpertModeChangeListener {
          */
         public CombineTracksToSegmentedTrackAction(GpxLayer layer) {
             // FIXME: icon missing, create a new icon for this action
-            //new ImageProvider("gpx_tracks_to_segmented_track").getResource().attachImageIcon(this, true);
+            //new ImageProvider(..."gpx_tracks_to_segmented_track").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Collect segments of all tracks and combine in a single track."));
             putValue(NAME, tr("Combine tracks of this layer"));
             this.layer = layer;
@@ -409,7 +409,7 @@ public class GpxLayer extends Layer implements ExpertModeChangeListener {
          */
         public SplitTrackSegementsToTracksAction(GpxLayer layer) {
             // FIXME: icon missing, create a new icon for this action
-            //new ImageProvider("gpx_segmented_track_to_tracks").getResource().attachImageIcon(this, true);
+            //new ImageProvider(..."gpx_segmented_track_to_tracks").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Split multiple track segments of one track into multiple tracks."));
             putValue(NAME, tr("Split track segments to tracks"));
             this.layer = layer;
@@ -442,7 +442,7 @@ public class GpxLayer extends Layer implements ExpertModeChangeListener {
          */
         public SplitTracksToLayersAction(GpxLayer layer) {
             // FIXME: icon missing, create a new icon for this action
-            //new ImageProvider("gpx_split_tracks_to_layers").getResource().attachImageIcon(this, true);
+            //new ImageProvider(..."gpx_split_tracks_to_layers").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Split the tracks of this layer to one new layer each."));
             putValue(NAME, tr("Split tracks to new layers"));
             this.layer = layer;
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
index 58f37d8..bba5622 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
@@ -999,6 +999,7 @@ public class GeoImageLayer extends AbstractModifiableLayer implements
 
         MapFrame map = MainApplication.getMap();
         if (map.getToggleDialog(ImageViewerDialog.class) == null) {
+            ImageViewerDialog.createInstance();
             map.addToggleDialog(ImageViewerDialog.getInstance());
         }
     }
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
index 02e80d1..096f74d 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
@@ -64,7 +64,7 @@ public class ImageDisplay extends JComponent implements Destroyable, PreferenceC
     /** The tracker to load the images */
     private final MediaTracker tracker = new MediaTracker(this);
 
-    private final ImgDisplayMouseListener mouseListener = new ImgDisplayMouseListener();
+    private final ImgDisplayMouseListener imgMouseListener = new ImgDisplayMouseListener();
 
     private String osdText;
 
@@ -307,7 +307,10 @@ public class ImageDisplay extends JComponent implements Destroyable, PreferenceC
                 }
                 if (tracker.isErrorID(1)) {
                     // the tracker catches OutOfMemory conditions
+                    tracker.removeImage(img);
                     img = null;
+                } else {
+                    tracker.removeImage(img);
                 }
             } else {
                 img = null;
@@ -316,7 +319,6 @@ public class ImageDisplay extends JComponent implements Destroyable, PreferenceC
             synchronized (ImageDisplay.this) {
                 if (this.entry != ImageDisplay.this.entry) {
                     // The file has changed
-                    tracker.removeImage(img);
                     return;
                 }
 
@@ -336,7 +338,6 @@ public class ImageDisplay extends JComponent implements Destroyable, PreferenceC
                         final Graphics2D g = rot.createGraphics();
                         g.drawImage(img, xform, null);
                         g.dispose();
-                        img.flush();
                         img = rot;
                     }
 
@@ -350,7 +351,6 @@ public class ImageDisplay extends JComponent implements Destroyable, PreferenceC
                 selectedRect = null;
                 errorLoading = (img == null);
             }
-            tracker.removeImage(img);
             ImageDisplay.this.repaint();
         }
     }
@@ -665,18 +665,18 @@ public class ImageDisplay extends JComponent implements Destroyable, PreferenceC
      * Constructs a new {@code ImageDisplay}.
      */
     public ImageDisplay() {
-        addMouseListener(mouseListener);
-        addMouseWheelListener(mouseListener);
-        addMouseMotionListener(mouseListener);
+        addMouseListener(imgMouseListener);
+        addMouseWheelListener(imgMouseListener);
+        addMouseMotionListener(imgMouseListener);
         Config.getPref().addPreferenceChangeListener(this);
         preferenceChanged(null);
     }
 
     @Override
     public void destroy() {
-        removeMouseListener(mouseListener);
-        removeMouseWheelListener(mouseListener);
-        removeMouseMotionListener(mouseListener);
+        removeMouseListener(imgMouseListener);
+        removeMouseWheelListener(imgMouseListener);
+        removeMouseMotionListener(imgMouseListener);
         Config.getPref().removePreferenceChangeListener(this);
     }
 
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
index 630c9ca..275dffa 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
@@ -58,13 +58,19 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange
 
     private boolean collapseButtonClicked;
 
+    static void createInstance() {
+        if (dialog != null)
+            throw new IllegalStateException("ImageViewerDialog instance was already created");
+        dialog = new ImageViewerDialog();
+    }
+
     /**
      * Replies the unique instance of this dialog
      * @return the unique instance
      */
     public static ImageViewerDialog getInstance() {
         if (dialog == null)
-            dialog = new ImageViewerDialog();
+            throw new AssertionError("a new instance needs to be created first");
         return dialog;
     }
 
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
index 884bbfc..b0c80f0 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
@@ -29,7 +29,7 @@ public class AudioMarker extends ButtonMarker {
     public boolean timeFromAudio; // as opposed to from the GPX track
 
     public AudioMarker(LatLon ll, TemplateEngineDataProvider dataProvider, URL audioUrl, MarkerLayer parentLayer, double time, double offset) {
-        super(ll, dataProvider, "speech", parentLayer, time, offset);
+        super(ll, dataProvider, /* ICON(markers/) */ "speech", parentLayer, time, offset);
         this.audioUrl = audioUrl;
         this.syncOffset = 0.0;
         this.timeFromAudio = false;
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java
index 2abf4e9..caa4816 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java
@@ -38,7 +38,7 @@ public class ImageMarker extends ButtonMarker {
     public URL imageUrl;
 
     public ImageMarker(LatLon ll, URL imageUrl, MarkerLayer parentLayer, double time, double offset) {
-        super(ll, "photo", parentLayer, time, offset);
+        super(ll, /* ICON(markers/) */ "photo", parentLayer, time, offset);
         this.imageUrl = imageUrl;
     }
 
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
index 363973b..647b101 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
@@ -60,7 +60,7 @@ public final class PlayHeadMarker extends Marker {
 
     private PlayHeadMarker() {
         super(LatLon.ZERO, "",
-                Config.getPref().get("marker.audiotracericon", "audio-tracer"),
+                Config.getPref().get("marker.audiotracericon", /* ICON(markers/) */ "audio-tracer"),
                 null, -1.0, 0.0);
         enabled = Config.getPref().getBoolean("marker.traceaudio", true);
         if (!enabled) return;
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java
index de348fc..78f5e65 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java
@@ -30,7 +30,7 @@ public class WebMarker extends ButtonMarker {
     private final URL webUrl;
 
     public WebMarker(LatLon ll, URL webUrl, MarkerLayer parentLayer, double time, double offset) {
-        super(ll, "web", parentLayer, time, offset);
+        super(ll, /* ICON(markers/) */ "web", parentLayer, time, offset);
         CheckParameterUtil.ensureParameterNotNull(webUrl, "webUrl");
         this.webUrl = webUrl;
     }
diff --git a/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java b/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
index 8963974..b1a89bf 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
@@ -70,6 +70,11 @@ public final class StyleCache {
     }
 
     @Override
+    public String toString() {
+        return "StyleCache{PLAIN: " + this.states[PLAIN] + " SELECTED: " + this.states[SELECTED] + "}";
+    }
+
+    @Override
     public int hashCode() {
         return Arrays.deepHashCode(this.states);
     }
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java
index 60de160..17a60c7 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java
@@ -19,6 +19,7 @@ import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.HiDPISupport;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 
 /**
  * This is the style that defines how an area is filled.
@@ -85,9 +86,13 @@ public class AreaElement extends StyleElement {
             // get base image from possible multi-resolution image, so we can
             // cast to BufferedImage and get pixel value at the center of the image
             img = HiDPISupport.getBaseImage(img);
-            color = new Color(((BufferedImage) img).getRGB(
-                    fillImage.getWidth() / 2, fillImage.getHeight() / 2)
-            );
+            try {
+                color = new Color(((BufferedImage) img).getRGB(
+                        fillImage.getWidth() / 2, fillImage.getHeight() / 2)
+                );
+            } catch (ArrayIndexOutOfBoundsException e) {
+                throw BugReport.intercept(e).put("env.osm", env.osm).put("iconRef", iconRef).put("fillImage", fillImage).put("img", img);
+            }
 
             fillImage.alpha = Utils.clamp(Config.getPref().getInt("mappaint.fill-image-alpha", 255), 0, 255);
             Integer pAlpha = Utils.colorFloat2int(c.get(FILL_OPACITY, null, float.class));
diff --git a/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java b/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java
index 0d2948c..9dc3107 100644
--- a/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java
@@ -76,7 +76,7 @@ public final class RemoteControlPreference extends DefaultTabPreferenceSetting {
     private JButton installCertificate;
     private JButton uninstallCertificate;
 
-    private final JCheckBox loadInNewLayer = new JCheckBox(tr("Download objects to new layer"));
+    private final JCheckBox loadInNewLayer = new JCheckBox(tr("Download as new layer"));
     private final JCheckBox alwaysAskUserConfirm = new JCheckBox(tr("Confirm all Remote Control actions manually"));
 
     @Override
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java
index 262dd38..92eaa59 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java
@@ -69,6 +69,11 @@ public final class TaggingPresetReader {
     public static class Chunk {
         /** The chunk id, can be referenced later */
         public String id;
+
+        @Override
+        public String toString() {
+            return "Chunk [id=" + id + ']';
+        }
     }
 
     /**
@@ -77,6 +82,11 @@ public final class TaggingPresetReader {
     public static class Reference {
         /** Reference matching a chunk id defined earlier **/
         public String ref;
+
+        @Override
+        public String toString() {
+            return "Reference [ref=" + ref + ']';
+        }
     }
 
     static class HashSetWithLast<E> extends LinkedHashSet<E> {
@@ -181,6 +191,7 @@ public final class TaggingPresetReader {
             } else {
                 o = parser.next();
             }
+            Logging.trace("Preset object: {0}", o);
             if (o instanceof Chunk) {
                 if (!lastIds.isEmpty() && ((Chunk) o).id.equals(lastIds.peek())) {
                     // pop last id on end of object, don't process further
@@ -322,6 +333,8 @@ public final class TaggingPresetReader {
     static Collection<TaggingPreset> readAll(String source, boolean validate, HashSetWithLast<TaggingPreset> all)
             throws SAXException, IOException {
         Collection<TaggingPreset> tp;
+        Logging.debug("Reading presets from {0}", source);
+        long startTime = System.currentTimeMillis();
         try (
             CachedFile cf = new CachedFile(source).setHttpAccept(PRESET_MIME_TYPES);
             // zip may be null, but Java 7 allows it: https://blogs.oracle.com/darcy/entry/project_coin_null_try_with
@@ -334,6 +347,9 @@ public final class TaggingPresetReader {
                 tp = readAll(new BufferedReader(r), validate, all);
             }
         }
+        if (Logging.isDebugEnabled()) {
+            Logging.debug("Presets read in {0}", Utils.getDurationString(System.currentTimeMillis() - startTime));
+        }
         return tp;
     }
 
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java
index 5fc44ed..90025d8 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java
@@ -57,4 +57,9 @@ public class PresetLink extends TaggingPresetItem {
     public void addCommands(List<Tag> changedTags) {
         // Do nothing
     }
+
+    @Override
+    public String toString() {
+        return "PresetLink [preset_name=" + preset_name + ']';
+    }
 }
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java
index 34da588..85ddbc9 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java
@@ -35,7 +35,7 @@ public class Roles extends TaggingPresetItem {
 
     /**
      * The <code>role</code> element in tagging preset definition.
-     * 
+     *
      * Information on a certain role, which is expected for the relation members.
      */
     public static class Role {
@@ -116,7 +116,6 @@ public class Roles extends TaggingPresetItem {
          */
         public boolean isRole(String role) {
             if (regexp && role != null) { // pass null through, it will anyway fail
-                
                 return role.matches(this.key);
             }
             return this.key.equals(role);
@@ -148,8 +147,16 @@ public class Roles extends TaggingPresetItem {
             }
             return true;
         }
+
+        @Override
+        public String toString() {
+            return "Role [key=" + key + ", text=" + text + ']';
+        }
     }
 
+    /**
+     * List of {@link Role} elements.
+     */
     public final List<Role> roles = new LinkedList<>();
 
     @Override
@@ -172,4 +179,9 @@ public class Roles extends TaggingPresetItem {
     @Override
     public void addCommands(List<Tag> changedTags) {
     }
+
+    @Override
+    public String toString() {
+        return "Roles [roles=" + roles + ']';
+    }
 }
diff --git a/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java b/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
index f164409..d05950f 100644
--- a/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
+++ b/src/org/openstreetmap/josm/gui/util/AdvancedKeyPressDetector.java
@@ -102,6 +102,7 @@ public class AdvancedKeyPressDetector implements AWTEventListener {
             timer.stop();
         }
         set.clear();
+        releaseEvent = null;
         if (!keyListeners.isEmpty()) {
             Logging.warn(tr("Some of the key listeners forgot to remove themselves: {0}"), keyListeners.toString());
         }
diff --git a/src/org/openstreetmap/josm/io/Compression.java b/src/org/openstreetmap/josm/io/Compression.java
index 3f79422..5ff6834 100644
--- a/src/org/openstreetmap/josm/io/Compression.java
+++ b/src/org/openstreetmap/josm/io/Compression.java
@@ -15,6 +15,8 @@ import java.util.zip.ZipOutputStream;
 
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
+import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
+import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -37,7 +39,11 @@ public enum Compression {
     /**
      * zip compression
      */
-    ZIP;
+    ZIP,
+    /**
+     * xz compression
+     */
+    XZ;
 
     /**
      * Determines the compression type depending on the suffix of {@code name}.
@@ -51,6 +57,8 @@ public enum Compression {
                 ? BZIP2
                 : name != null && name.endsWith(".zip")
                 ? ZIP
+                : name != null && name.endsWith(".xz")
+                ? XZ
                 : NONE;
     }
 
@@ -67,6 +75,8 @@ public enum Compression {
             return GZIP;
         case "application/x-bzip2":
             return BZIP2;
+        case "application/x-xz":
+            return XZ;
         default:
             return NONE;
         }
@@ -87,6 +97,8 @@ public enum Compression {
                 return getGZipInputStream(in);
             case ZIP:
                 return getZipInputStream(in);
+            case XZ:
+                return getXZInputStream(in);
             case NONE:
             default:
                 return in;
@@ -94,6 +106,20 @@ public enum Compression {
     }
 
     /**
+     * Returns a XZ input stream wrapping given input stream.
+     * @param in The raw input stream
+     * @return a XZ input stream wrapping given input stream, or {@code null} if {@code in} is {@code null}
+     * @throws IOException if the given input stream does not contain valid BZ2 header
+     * @since 13350
+     */
+    public static XZCompressorInputStream getXZInputStream(InputStream in) throws IOException {
+        if (in == null) {
+            return null;
+        }
+        return new XZCompressorInputStream(in, true);
+    }
+
+    /**
      * Returns a Bzip2 input stream wrapping given input stream.
      * @param in The raw input stream
      * @return a Bzip2 input stream wrapping given input stream, or {@code null} if {@code in} is {@code null}
@@ -172,6 +198,8 @@ public enum Compression {
                 return new GZIPOutputStream(out);
             case ZIP:
                 return new ZipOutputStream(out, StandardCharsets.UTF_8);
+            case XZ:
+                return new XZCompressorOutputStream(out);
             case NONE:
             default:
                 return out;
diff --git a/src/org/openstreetmap/josm/io/OsmServerLocationReader.java b/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
index 77a593d..f62982c 100644
--- a/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
@@ -83,8 +83,10 @@ public class OsmServerLocationReader extends OsmServerReader {
      * @since 12679
      */
     public enum NoteUrlPattern {
+        /** URL of OSM API Notes endpoint */
         API_URL  ("https?://.*/api/0.6/notes.*"),
-        DUMP_FILE("https?://.*/(.*\\.osn(.bz2)?)");
+        /** URL of OSM API Notes compressed dump file */
+        DUMP_FILE("https?://.*/(.*\\.osn(\\.(gz|xz|bz2?|zip))?)");
 
         private final String urlPattern;
 
@@ -146,58 +148,43 @@ public class OsmServerLocationReader extends OsmServerReader {
     }
 
     @Override
-    public DataSet parseOsm(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return doParse(new OsmParser(progressMonitor, Compression.NONE), progressMonitor);
+    public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
+        return parseOsm(progressMonitor, Compression.NONE);
     }
 
     @Override
-    public DataSet parseOsmBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return doParse(new OsmParser(progressMonitor, Compression.BZIP2), progressMonitor);
+    public DataSet parseOsm(ProgressMonitor progressMonitor, Compression compression) throws OsmTransferException {
+        return doParse(new OsmParser(progressMonitor, compression), progressMonitor);
     }
 
     @Override
-    public DataSet parseOsmGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return doParse(new OsmParser(progressMonitor, Compression.GZIP), progressMonitor);
+    public DataSet parseOsmChange(ProgressMonitor progressMonitor) throws OsmTransferException {
+        return parseOsmChange(progressMonitor, Compression.NONE);
     }
 
     @Override
-    public DataSet parseOsmZip(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return doParse(new OsmParser(progressMonitor, Compression.ZIP), progressMonitor);
+    public DataSet parseOsmChange(ProgressMonitor progressMonitor, Compression compression) throws OsmTransferException {
+        return doParse(new OsmChangeParser(progressMonitor, compression), progressMonitor);
     }
 
     @Override
-    public DataSet parseOsmChange(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return doParse(new OsmChangeParser(progressMonitor, Compression.NONE), progressMonitor);
+    public GpxData parseRawGps(ProgressMonitor progressMonitor) throws OsmTransferException {
+        return parseRawGps(progressMonitor, Compression.NONE);
     }
 
     @Override
-    public DataSet parseOsmChangeBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return doParse(new OsmChangeParser(progressMonitor, Compression.BZIP2), progressMonitor);
+    public GpxData parseRawGps(ProgressMonitor progressMonitor, Compression compression) throws OsmTransferException {
+        return doParse(new GpxParser(progressMonitor, compression), progressMonitor);
     }
 
     @Override
-    public DataSet parseOsmChangeGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return doParse(new OsmChangeParser(progressMonitor, Compression.GZIP), progressMonitor);
+    public List<Note> parseRawNotes(ProgressMonitor progressMonitor) throws OsmTransferException {
+        return parseRawNotes(progressMonitor, Compression.NONE);
     }
 
     @Override
-    public GpxData parseRawGps(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return doParse(new GpxParser(progressMonitor, Compression.NONE), progressMonitor);
-    }
-
-    @Override
-    public GpxData parseRawGpsBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return doParse(new GpxParser(progressMonitor, Compression.BZIP2), progressMonitor);
-    }
-
-    @Override
-    public List<Note> parseRawNotes(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return doParse(new NoteParser(progressMonitor, Compression.NONE), progressMonitor);
-    }
-
-    @Override
-    public List<Note> parseRawNotesBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return doParse(new NoteParser(progressMonitor, Compression.BZIP2), progressMonitor);
+    public List<Note> parseRawNotes(ProgressMonitor progressMonitor, Compression compression) throws OsmTransferException {
+        return doParse(new NoteParser(progressMonitor, compression), progressMonitor);
     }
 
     protected class OsmParser extends Parser<DataSet> {
diff --git a/src/org/openstreetmap/josm/io/OsmServerReader.java b/src/org/openstreetmap/josm/io/OsmServerReader.java
index d47ee55..b6918fb 100644
--- a/src/org/openstreetmap/josm/io/OsmServerReader.java
+++ b/src/org/openstreetmap/josm/io/OsmServerReader.java
@@ -126,7 +126,7 @@ public abstract class OsmServerReader extends OsmConnection {
      * @param progressMonitor progress monitoring and abort handler
      * @param reason The reason to show on console. Can be {@code null} if no reason is given
      * @param uncompressAccordingToContentDisposition Whether to inspect the HTTP header {@code Content-Disposition}
-     *                                                for {@code filename} and uncompress a gzip/bzip2 stream.
+     *                                                for {@code filename} and uncompress a gzip/bzip2/xz/zip stream.
      * @return An reader reading the input stream (servers answer) or <code>null</code>.
      * @throws OsmTransferException if data transfer errors occur
      */
@@ -142,7 +142,7 @@ public abstract class OsmServerReader extends OsmConnection {
      * @param progressMonitor progress monitoring and abort handler
      * @param reason The reason to show on console. Can be {@code null} if no reason is given
      * @param uncompressAccordingToContentDisposition Whether to inspect the HTTP header {@code Content-Disposition}
-     *                                                for {@code filename} and uncompress a gzip/bzip2 stream.
+     *                                                for {@code filename} and uncompress a gzip/bzip2/xz/zip stream.
      * @param httpMethod HTTP method ("GET", "POST" or "PUT")
      * @param requestBody HTTP request body (for "POST" and "PUT" methods only). Must be null for "GET" method.
      * @return An reader reading the input stream (servers answer) or <code>null</code>.
@@ -163,9 +163,10 @@ public abstract class OsmServerReader extends OsmConnection {
                 throw new OsmTransferException(e);
             }
 
-            if ("file".equals(url.getProtocol())) {
+            String protocol = url.getProtocol();
+            if ("file".equals(protocol) || "jar".equals(protocol)) {
                 try {
-                    return url.openStream();
+                    return Utils.openStream(url);
                 } catch (IOException e) {
                     throw new OsmTransferException(e);
                 }
@@ -247,42 +248,82 @@ public abstract class OsmServerReader extends OsmConnection {
     public abstract DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException;
 
     /**
-     * Download OSM Change files from somewhere
+     * Download compressed OSM files from somewhere
      * @param progressMonitor The progress monitor
+     * @param compression compression to use
      * @return The corresponding dataset
      * @throws OsmTransferException if any error occurs
+     * @since 13352
      */
-    public DataSet parseOsmChange(final ProgressMonitor progressMonitor) throws OsmTransferException {
+    public DataSet parseOsm(ProgressMonitor progressMonitor, Compression compression) throws OsmTransferException {
         return null;
     }
 
     /**
-     * Download BZip2-compressed OSM Change files from somewhere
+     * Download OSM Change uncompressed files from somewhere
      * @param progressMonitor The progress monitor
      * @return The corresponding dataset
      * @throws OsmTransferException if any error occurs
      */
-    public DataSet parseOsmChangeBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
+    public DataSet parseOsmChange(ProgressMonitor progressMonitor) throws OsmTransferException {
         return null;
     }
 
     /**
-     * Download GZip-compressed OSM Change files from somewhere
+     * Download OSM Change compressed files from somewhere
      * @param progressMonitor The progress monitor
+     * @param compression compression to use
      * @return The corresponding dataset
      * @throws OsmTransferException if any error occurs
+     * @since 13352
      */
-    public DataSet parseOsmChangeGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
+    public DataSet parseOsmChange(ProgressMonitor progressMonitor, Compression compression) throws OsmTransferException {
         return null;
     }
 
     /**
+     * Download BZip2-compressed OSM Change files from somewhere
+     * @param progressMonitor The progress monitor
+     * @return The corresponding dataset
+     * @throws OsmTransferException if any error occurs
+     * @deprecated use {@link #parseOsmChange(ProgressMonitor, Compression)} instead
+     */
+    @Deprecated
+    public DataSet parseOsmChangeBzip2(ProgressMonitor progressMonitor) throws OsmTransferException {
+        return parseOsmChange(progressMonitor, Compression.BZIP2);
+    }
+
+    /**
+     * Download GZip-compressed OSM Change files from somewhere
+     * @param progressMonitor The progress monitor
+     * @return The corresponding dataset
+     * @throws OsmTransferException if any error occurs
+     * @deprecated use {@link #parseOsmChange(ProgressMonitor, Compression)} instead
+     */
+    @Deprecated
+    public DataSet parseOsmChangeGzip(ProgressMonitor progressMonitor) throws OsmTransferException {
+        return parseOsmChange(progressMonitor, Compression.GZIP);
+    }
+
+    /**
      * Retrieve raw gps waypoints from the server API.
      * @param progressMonitor The progress monitor
      * @return The corresponding GPX tracks
      * @throws OsmTransferException if any error occurs
      */
-    public GpxData parseRawGps(final ProgressMonitor progressMonitor) throws OsmTransferException {
+    public GpxData parseRawGps(ProgressMonitor progressMonitor) throws OsmTransferException {
+        return null;
+    }
+
+    /**
+     * Retrieve compressed GPX files from somewhere.
+     * @param progressMonitor The progress monitor
+     * @param compression compression to use
+     * @return The corresponding GPX tracks
+     * @throws OsmTransferException if any error occurs
+     * @since 13352
+     */
+    public GpxData parseRawGps(ProgressMonitor progressMonitor, Compression compression) throws OsmTransferException {
         return null;
     }
 
@@ -291,10 +332,12 @@ public abstract class OsmServerReader extends OsmConnection {
      * @param progressMonitor The progress monitor
      * @return The corresponding GPX tracks
      * @throws OsmTransferException if any error occurs
+     * @deprecated use {@link #parseRawGps(ProgressMonitor, Compression)} instead
      * @since 6244
      */
-    public GpxData parseRawGpsBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return null;
+    @Deprecated
+    public GpxData parseRawGpsBzip2(ProgressMonitor progressMonitor) throws OsmTransferException {
+        return parseRawGps(progressMonitor, Compression.BZIP2);
     }
 
     /**
@@ -302,9 +345,11 @@ public abstract class OsmServerReader extends OsmConnection {
      * @param progressMonitor The progress monitor
      * @return The corresponding dataset
      * @throws OsmTransferException if any error occurs
+     * @deprecated use {@link #parseOsm(ProgressMonitor, Compression)} instead
      */
-    public DataSet parseOsmBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return null;
+    @Deprecated
+    public DataSet parseOsmBzip2(ProgressMonitor progressMonitor) throws OsmTransferException {
+        return parseOsm(progressMonitor, Compression.BZIP2);
     }
 
     /**
@@ -312,9 +357,11 @@ public abstract class OsmServerReader extends OsmConnection {
      * @param progressMonitor The progress monitor
      * @return The corresponding dataset
      * @throws OsmTransferException if any error occurs
+     * @deprecated use {@link #parseOsm(ProgressMonitor, Compression)} instead
      */
-    public DataSet parseOsmGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return null;
+    @Deprecated
+    public DataSet parseOsmGzip(ProgressMonitor progressMonitor) throws OsmTransferException {
+        return parseOsm(progressMonitor, Compression.GZIP);
     }
 
     /**
@@ -322,10 +369,12 @@ public abstract class OsmServerReader extends OsmConnection {
      * @param progressMonitor The progress monitor
      * @return The corresponding dataset
      * @throws OsmTransferException if any error occurs
+     * @deprecated use {@link #parseOsm(ProgressMonitor, Compression)} instead
      * @since 6882
      */
+    @Deprecated
     public DataSet parseOsmZip(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return null;
+        return parseOsm(progressMonitor, Compression.ZIP);
     }
 
     /**
@@ -384,13 +433,27 @@ public abstract class OsmServerReader extends OsmConnection {
     }
 
     /**
+     * Download notes from a URL that contains a compressed notes dump file
+     * @param progressMonitor progress monitor
+     * @param compression compression to use
+     * @return A list of notes parsed from the URL
+     * @throws OsmTransferException if any error occurs during dialog with OSM API
+     * @since 13352
+     */
+    public List<Note> parseRawNotes(ProgressMonitor progressMonitor, Compression compression) throws OsmTransferException {
+        return null;
+    }
+
+    /**
      * Download notes from a URL that contains a bzip2 compressed notes dump file
      * @param progressMonitor progress monitor
      * @return A list of notes parsed from the URL
      * @throws OsmTransferException if any error occurs during dialog with OSM API
+     * @deprecated Use {@link #parseRawNotes(ProgressMonitor, Compression)} instead
      */
+    @Deprecated
     public List<Note> parseRawNotesBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
-        return null;
+        return parseRawNotes(progressMonitor, Compression.BZIP2);
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/io/OverpassDownloadReader.java b/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
index 2d3010f..4b2d6ad 100644
--- a/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
+++ b/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
@@ -393,4 +393,16 @@ public class OverpassDownloadReader extends BoundingBoxDownloader {
 
         return ds;
     }
+
+    /**
+     * Fixes Overpass API query to make sure it will be accepted by JOSM.
+     * @param query Overpass query to check
+     * @return fixed query
+     * @since 13335
+     */
+    public static String fixQuery(String query) {
+        return query == null ? query : query
+                .replaceAll("out( body| skel| ids)?( id| qt)?;", "out meta$2;")
+                .replaceAll("(?s)\\[out:(json|csv)[^\\]]*\\]", "[out:xml]");
+    }
 }
diff --git a/src/org/openstreetmap/josm/io/imagery/ImageryReader.java b/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
index 8a6862d..d72bf2c 100644
--- a/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
+++ b/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
@@ -206,7 +206,8 @@ public class ImageryReader implements Closeable {
                         "icon",
                         "date",
                         TILE_SIZE,
-                        "valid-georeference"
+                        "valid-georeference",
+                        "mod-tile-features"
                 ).contains(qName)) {
                     newState = State.ENTRY_ATTRIBUTE;
                     lang = atts.getValue("lang");
@@ -470,6 +471,9 @@ public class ImageryReader implements Closeable {
                 case "valid-georeference":
                     entry.setGeoreferenceValid(Boolean.parseBoolean(accumulator.toString()));
                     break;
+                case "mod-tile-features":
+                    entry.setModTileFeatures(Boolean.parseBoolean(accumulator.toString()));
+                    break;
                 default: // Do nothing
                 }
                 break;
diff --git a/src/org/openstreetmap/josm/io/imagery/WMSImagery.java b/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
index ba15042..8026347 100644
--- a/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
+++ b/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
@@ -3,6 +3,7 @@ package org.openstreetmap.josm.io.imagery;
 
 import java.awt.HeadlessException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.net.MalformedURLException;
@@ -16,6 +17,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.NoSuchElementException;
 import java.util.Set;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -119,6 +121,7 @@ public class WMSImagery {
     private List<LayerDetails> layers;
     private URL serviceUrl;
     private List<String> formats;
+    private String version = "1.1.1";
 
     /**
      * Returns the list of layers.
@@ -137,6 +140,15 @@ public class WMSImagery {
     }
 
     /**
+     * Returns the WMS version used.
+     * @return the WMS version used (1.1.1 or 1.3.0)
+     * @since 13358
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
      * Returns the list of supported formats.
      * @return the list of supported formats
      */
@@ -196,9 +208,9 @@ public class WMSImagery {
      */
     public String buildGetMapUrl(Collection<LayerDetails> selectedLayers, String format) {
         return buildRootUrl() + "FORMAT=" + format + (imageFormatHasTransparency(format) ? "&TRANSPARENT=TRUE" : "")
-                + "&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS="
+                + "&VERSION=" + version + "&SERVICE=WMS&REQUEST=GetMap&LAYERS="
                 + selectedLayers.stream().map(x -> x.ident).collect(Collectors.joining(","))
-                + "&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}";
+                + "&STYLES=&" + ("1.3.0".equals(version) ? "CRS" : "SRS") + "={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}";
     }
 
     /**
@@ -233,20 +245,75 @@ public class WMSImagery {
             return;
         }
 
+        doAttemptGetCapabilities(serviceUrlStr, getCapabilitiesUrl);
+    }
+
+    /**
+     * Attempts WMS GetCapabilities with version 1.1.1 first, then 1.3.0 in case of specific errors.
+     * @param serviceUrlStr WMS service URL
+     * @param getCapabilitiesUrl GetCapabilities URL
+     * @throws IOException if any I/O error occurs
+     * @throws WMSGetCapabilitiesException if any HTTP or parsing error occurs
+     */
+    private void doAttemptGetCapabilities(String serviceUrlStr, URL getCapabilitiesUrl)
+            throws IOException, WMSGetCapabilitiesException {
+        final String url = getCapabilitiesUrl.toExternalForm();
         final Response response = HttpClient.create(getCapabilitiesUrl).connect();
-        String incomingData = null;
 
+        // Is the HTTP connection successul ?
         if (response.getResponseCode() >= 400) {
-            throw new WMSGetCapabilitiesException(response.getResponseMessage(), response.fetchContent());
+            // HTTP error for servers handling only WMS 1.3.0 ?
+            String errorMessage = response.getResponseMessage();
+            String errorContent = response.fetchContent();
+            Matcher tomcat = HttpClient.getTomcatErrorMatcher(errorContent);
+            boolean messageAbout130 = errorMessage != null && errorMessage.contains("1.3.0");
+            boolean contentAbout130 = errorContent != null && tomcat != null && tomcat.matches() && tomcat.group(1).contains("1.3.0");
+            if (url.contains("VERSION=1.1.1") && (messageAbout130 || contentAbout130)) {
+                doAttemptGetCapabilities130(serviceUrlStr, url);
+                return;
+            }
+            throw new WMSGetCapabilitiesException(errorMessage, errorContent);
         }
 
         try {
+            // Parse XML capabilities sent by the server
+            parseCapabilities(serviceUrlStr, response.getContent());
+        } catch (WMSGetCapabilitiesException e) {
+            // ServiceException for servers handling only WMS 1.3.0 ?
+            if (e.getCause() == null && url.contains("VERSION=1.1.1")) {
+                doAttemptGetCapabilities130(serviceUrlStr, url);
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    /**
+     * Attempts WMS GetCapabilities with version 1.3.0.
+     * @param serviceUrlStr WMS service URL
+     * @param url GetCapabilities URL
+     * @throws IOException if any I/O error occurs
+     * @throws WMSGetCapabilitiesException if any HTTP or parsing error occurs
+     * @throws MalformedURLException in case of invalid URL
+     */
+    private void doAttemptGetCapabilities130(String serviceUrlStr, final String url)
+            throws IOException, WMSGetCapabilitiesException, MalformedURLException {
+        doAttemptGetCapabilities(serviceUrlStr, new URL(url.replace("VERSION=1.1.1", "VERSION=1.3.0")));
+        if (serviceUrl.toExternalForm().contains("VERSION=1.1.1")) {
+            serviceUrl = new URL(serviceUrl.toExternalForm().replace("VERSION=1.1.1", "VERSION=1.3.0"));
+        }
+        version = "1.3.0";
+    }
+
+    void parseCapabilities(String serviceUrlStr, InputStream contentStream) throws IOException, WMSGetCapabilitiesException {
+        String incomingData = null;
+        try {
             DocumentBuilder builder = Utils.newSafeDOMBuilder();
             builder.setEntityResolver((publicId, systemId) -> {
                 Logging.info("Ignoring DTD " + publicId + ", " + systemId);
                 return new InputSource(new StringReader(""));
             });
-            Document document = builder.parse(response.getContent());
+            Document document = builder.parse(contentStream);
             Element root = document.getDocumentElement();
 
             try {
@@ -368,7 +435,7 @@ public class WMSImagery {
         // I think CRS and SRS are the same at this point
         getChildrenStream(element)
             .filter(child -> "CRS".equals(child.getNodeName()) || "SRS".equals(child.getNodeName()))
-            .map(child -> (String) getContent(child))
+            .map(WMSImagery::getContent)
             .filter(crs -> !crs.isEmpty())
             .map(crs -> crs.trim().toUpperCase(Locale.ENGLISH))
             .forEach(crsList::add);
@@ -420,19 +487,20 @@ public class WMSImagery {
         if (child == null)
             return missing;
         else {
-            String content = (String) getContent(child);
+            String content = getContent(child);
             return (!content.isEmpty()) ? content : empty;
         }
     }
 
-    private static Object getContent(Element element) {
+    private static String getContent(Element element) {
         NodeList nl = element.getChildNodes();
         StringBuilder content = new StringBuilder();
         for (int i = 0; i < nl.getLength(); i++) {
             Node node = nl.item(i);
             switch (node.getNodeType()) {
                 case Node.ELEMENT_NODE:
-                    return node;
+                    content.append(getContent((Element) node));
+                    break;
                 case Node.CDATA_SECTION_NODE:
                 case Node.TEXT_NODE:
                     content.append(node.getNodeValue());
diff --git a/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java b/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
index fcb5858..208c16e 100644
--- a/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
+++ b/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
@@ -181,7 +181,7 @@ public class PluginDownloadTask extends PleaseWaitRunnable {
             }
             downloaded.add(d);
         }
-        PluginHandler.installDownloadedPlugins(false);
+        PluginHandler.installDownloadedPlugins(toUpdate, false);
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/plugins/PluginHandler.java b/src/org/openstreetmap/josm/plugins/PluginHandler.java
index c36a3a6..ec3f80f 100644
--- a/src/org/openstreetmap/josm/plugins/PluginHandler.java
+++ b/src/org/openstreetmap/josm/plugins/PluginHandler.java
@@ -15,6 +15,7 @@ import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.security.AccessController;
@@ -1233,16 +1234,17 @@ public final class PluginHandler {
     }
 
     /**
-     * Installs downloaded plugins. Moves files with the suffix ".jar.new" to the corresponding
-     * ".jar" files.
+     * Installs downloaded plugins. Moves files with the suffix ".jar.new" to the corresponding ".jar" files.
      *
      * If {@code dowarn} is true, this methods emits warning messages on the console if a downloaded
      * but not yet installed plugin .jar can't be be installed. If {@code dowarn} is false, the
      * installation of the respective plugin is silently skipped.
      *
+     * @param pluginsToLoad list of plugin informations to update
      * @param dowarn if true, warning messages are displayed; false otherwise
+     * @since 13294
      */
-    public static void installDownloadedPlugins(boolean dowarn) {
+    public static void installDownloadedPlugins(Collection<PluginInformation> pluginsToLoad, boolean dowarn) {
         File pluginDir = Main.pref.getPluginsDirectory();
         if (!pluginDir.exists() || !pluginDir.isDirectory() || !pluginDir.canWrite())
             return;
@@ -1255,13 +1257,6 @@ public final class PluginHandler {
             final String filePath = updatedPlugin.getPath();
             File plugin = new File(filePath.substring(0, filePath.length() - 4));
             String pluginName = updatedPlugin.getName().substring(0, updatedPlugin.getName().length() - 8);
-            if (plugin.exists() && !plugin.delete() && dowarn) {
-                Logging.warn(tr("Failed to delete outdated plugin ''{0}''.", plugin.toString()));
-                Logging.warn(tr("Failed to install already downloaded plugin ''{0}''. " +
-                        "Skipping installation. JOSM is still going to load the old plugin version.",
-                        pluginName));
-                continue;
-            }
             try {
                 // Check the plugin is a valid and accessible JAR file before installing it (fix #7754)
                 new JarFile(updatedPlugin).close();
@@ -1272,8 +1267,25 @@ public final class PluginHandler {
                 }
                 continue;
             }
+            if (plugin.exists() && !plugin.delete() && dowarn) {
+                Logging.warn(tr("Failed to delete outdated plugin ''{0}''.", plugin.toString()));
+                Logging.warn(tr("Failed to install already downloaded plugin ''{0}''. " +
+                        "Skipping installation. JOSM is still going to load the old plugin version.",
+                        pluginName));
+                continue;
+            }
             // Install plugin
-            if (!updatedPlugin.renameTo(plugin) && dowarn) {
+            if (updatedPlugin.renameTo(plugin)) {
+                try {
+                    // Update plugin URL
+                    URL newPluginURL = plugin.toURI().toURL();
+                    URL oldPluginURL = updatedPlugin.toURI().toURL();
+                    pluginsToLoad.stream().filter(x -> x.libraries.contains(oldPluginURL)).forEach(
+                            x -> Collections.replaceAll(x.libraries, oldPluginURL, newPluginURL));
+                } catch (MalformedURLException e) {
+                    Logging.warn(e);
+                }
+            } else if (dowarn) {
                 Logging.warn(tr("Failed to install plugin ''{0}'' from temporary download file ''{1}''. Renaming failed.",
                         plugin.toString(), updatedPlugin.toString()));
                 Logging.warn(tr("Failed to install already downloaded plugin ''{0}''. " +
diff --git a/src/org/openstreetmap/josm/tools/HttpClient.java b/src/org/openstreetmap/josm/tools/HttpClient.java
index 91c434d..4daf768 100644
--- a/src/org/openstreetmap/josm/tools/HttpClient.java
+++ b/src/org/openstreetmap/josm/tools/HttpClient.java
@@ -60,6 +60,14 @@ public final class HttpClient {
     private Response response;
     private boolean finishOnCloseOutput = true;
 
+    // Pattern to detect Tomcat error message. Be careful with change of format:
+    // CHECKSTYLE.OFF: LineLength
+    // https://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?r1=1740707&r2=1779641&pathrev=1779641&diff_format=h
+    // CHECKSTYLE.ON: LineLength
+    private static final Pattern TOMCAT_ERR_MESSAGE = Pattern.compile(
+        ".*<p><b>[^<]+</b>[^<]+</p><p><b>[^<]+</b> (?:<u>)?([^<]*)(?:</u>)?</p><p><b>[^<]+</b> (?:<u>)?[^<]*(?:</u>)?</p>.*",
+        Pattern.CASE_INSENSITIVE);
+
     static {
         CookieHandler.setDefault(new CookieManager());
     }
@@ -686,4 +694,15 @@ public final class HttpClient {
             connection.disconnect();
         }
     }
+
+    /**
+     * Returns a {@link Matcher} against predefined Tomcat error messages.
+     * If it matches, error message can be extracted from {@code group(1)}.
+     * @param data HTML contents to check
+     * @return a {@link Matcher} against predefined Tomcat error messages
+     * @since 13358
+     */
+    public static Matcher getTomcatErrorMatcher(String data) {
+        return data != null ? TOMCAT_ERR_MESSAGE.matcher(data) : null;
+    }
 }
diff --git a/src/org/openstreetmap/josm/tools/I18n.java b/src/org/openstreetmap/josm/tools/I18n.java
index 47ea748..77f3171 100644
--- a/src/org/openstreetmap/josm/tools/I18n.java
+++ b/src/org/openstreetmap/josm/tools/I18n.java
@@ -418,8 +418,8 @@ public final class I18n {
             return false;
         }
         try (
-            InputStream enStream = en.openStream();
-            InputStream trStream = tr.openStream()
+            InputStream enStream = Utils.openStream(en);
+            InputStream trStream = Utils.openStream(tr)
         ) {
             if (load(enStream, trStream, false)) {
                 pluralMode = languages.get(l);
diff --git a/src/org/openstreetmap/josm/tools/ImageProvider.java b/src/org/openstreetmap/josm/tools/ImageProvider.java
index 9b6b913..a12b554 100644
--- a/src/org/openstreetmap/josm/tools/ImageProvider.java
+++ b/src/org/openstreetmap/josm/tools/ImageProvider.java
@@ -1224,19 +1224,6 @@ public class ImageProvider {
         return null;
     }
 
-    /** Quit parsing, when a certain condition is met */
-    private static class SAXReturnException extends SAXException {
-        private final String result;
-
-        SAXReturnException(String result) {
-            this.result = result;
-        }
-
-        public String getResult() {
-            return result;
-        }
-    }
-
     /**
      * Reads the wiki page on a certain file in html format in order to find the real image URL.
      *
@@ -1730,23 +1717,16 @@ public class ImageProvider {
     public static BufferedImage read(URL input, boolean readMetadata, boolean enforceTransparency) throws IOException {
         CheckParameterUtil.ensureParameterNotNull(input, "input");
 
-        InputStream istream = null;
-        try {
-            istream = input.openStream();
-        } catch (IOException e) {
-            throw new IIOException("Can't get input stream from URL!", e);
-        }
-        ImageInputStream stream = ImageIO.createImageInputStream(istream);
-        BufferedImage bi;
-        try {
-            bi = read(stream, readMetadata, enforceTransparency);
+        try (InputStream istream = Utils.openStream(input)) {
+            ImageInputStream stream = ImageIO.createImageInputStream(istream);
+            BufferedImage bi = read(stream, readMetadata, enforceTransparency);
             if (bi == null) {
                 stream.close();
             }
-        } finally {
-            istream.close();
+            return bi;
+        } catch (IOException e) {
+            throw new IIOException("Can't get input stream from URL!", e);
         }
-        return bi;
     }
 
     /**
diff --git a/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java b/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java
index 28a705a..ef82fc6 100644
--- a/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java
+++ b/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java
@@ -6,7 +6,6 @@ import java.io.Reader;
 
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
 import org.openstreetmap.josm.io.CachedFile;
@@ -21,7 +20,7 @@ import org.openstreetmap.josm.io.CachedFile;
 public final class OverpassTurboQueryWizard {
 
     private static OverpassTurboQueryWizard instance;
-    private final ScriptEngine engine = new ScriptEngineManager().getEngineByName("JavaScript");
+    private final ScriptEngine engine = Utils.getJavaScriptEngine();
 
     /**
      * Replies the unique instance of this class.
@@ -36,21 +35,20 @@ public final class OverpassTurboQueryWizard {
     }
 
     private OverpassTurboQueryWizard() {
-        if (engine == null) {
-            throw new IllegalStateException("Failed to retrieve JavaScript engine");
-        }
         try (CachedFile file = new CachedFile("resource://data/overpass-wizard.js");
              Reader reader = file.getContentReader()) {
-            engine.eval("var console = {error: " + Logging.class.getCanonicalName() + ".warn};");
-            engine.eval("var global = {};");
-            engine.eval(reader);
-            engine.eval("var overpassWizard = function(query) {" +
-                    "  return global.overpassWizard(query, {" +
-                    "    comment: false," +
-                    "    outputFormat: 'xml'," +
-                    "    outputMode: 'recursive_meta'" +
-                    "  });" +
-                    "}");
+            if (engine != null) {
+                engine.eval("var console = {error: " + Logging.class.getCanonicalName() + ".warn};");
+                engine.eval("var global = {};");
+                engine.eval(reader);
+                engine.eval("var overpassWizard = function(query) {" +
+                        "  return global.overpassWizard(query, {" +
+                        "    comment: false," +
+                        "    outputFormat: 'xml'," +
+                        "    outputMode: 'recursive_meta'" +
+                        "  });" +
+                        "}");
+            }
         } catch (ScriptException | IOException ex) {
             throw new IllegalStateException("Failed to initialize OverpassTurboQueryWizard", ex);
         }
@@ -63,6 +61,9 @@ public final class OverpassTurboQueryWizard {
      * @throws UncheckedParseException when the parsing fails
      */
     public String constructQuery(String search) {
+        if (engine == null) {
+            throw new IllegalStateException("Failed to retrieve JavaScript engine");
+        }
         try {
             final Object result = ((Invocable) engine).invokeFunction("overpassWizard", search);
             if (Boolean.FALSE.equals(result)) {
diff --git a/src/org/openstreetmap/josm/tools/SAXReturnException.java b/src/org/openstreetmap/josm/tools/SAXReturnException.java
new file mode 100644
index 0000000..1c001b3
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/SAXReturnException.java
@@ -0,0 +1,17 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import org.xml.sax.SAXException;
+
+/** Quit parsing, when a certain condition is met */
+class SAXReturnException extends SAXException {
+    private final String result;
+
+    SAXReturnException(String result) {
+        this.result = result;
+    }
+
+    public final String getResult() {
+        return result;
+    }
+}
diff --git a/src/org/openstreetmap/josm/tools/Utils.java b/src/org/openstreetmap/josm/tools/Utils.java
index fee90d8..91a7f2a 100644
--- a/src/org/openstreetmap/josm/tools/Utils.java
+++ b/src/org/openstreetmap/josm/tools/Utils.java
@@ -13,6 +13,7 @@ import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -25,7 +26,10 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
 import java.security.AccessController;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -60,6 +64,8 @@ import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import java.util.zip.ZipFile;
 
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -1196,6 +1202,16 @@ public final class Utils {
     }
 
     /**
+     * A ForkJoinWorkerThread that will always inherit caller permissions,
+     * unlike JDK's InnocuousForkJoinWorkerThread, used if a security manager exists.
+     */
+    static final class JosmForkJoinWorkerThread extends ForkJoinWorkerThread {
+        JosmForkJoinWorkerThread(ForkJoinPool pool) {
+            super(pool);
+        }
+    }
+
+    /**
      * Returns a {@link ForkJoinPool} with the parallelism given by the preference key.
      * @param pref The preference key to determine parallelism
      * @param nameFormat see {@link #newThreadFactory(String, int)}
@@ -1208,7 +1224,11 @@ public final class Utils {
             final AtomicLong count = new AtomicLong(0);
             @Override
             public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
-                final ForkJoinWorkerThread thread = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
+                // Do not use JDK default thread factory !
+                // If JOSM is started with Java Web Start, a security manager is installed and the factory
+                // creates threads without any permission, forbidding them to load a class instantiating
+                // another ForkJoinPool such as MultipolygonBuilder (see bug #15722)
+                final ForkJoinWorkerThread thread = new JosmForkJoinWorkerThread(pool);
                 thread.setName(String.format(Locale.ENGLISH, nameFormat, count.getAndIncrement()));
                 thread.setPriority(threadPriority);
                 return thread;
@@ -1705,4 +1725,64 @@ public final class Utils {
         return Optional.empty();
     }
 
+    /**
+     * Returns JRE JavaScript Engine (Nashorn by default), if any.
+     * Catches and logs SecurityException and return null in case of error.
+     * @return JavaScript Engine, or null.
+     * @since 13301
+     */
+    public static ScriptEngine getJavaScriptEngine() {
+        try {
+            return new ScriptEngineManager(null).getEngineByName("JavaScript");
+        } catch (SecurityException e) {
+            Logging.error(e);
+            return null;
+        }
+    }
+
+    /**
+     * Convenient method to open an URL stream, using JOSM HTTP client if neeeded.
+     * @param url URL for reading from
+     * @return an input stream for reading from the URL
+     * @throws IOException if any I/O error occurs
+     * @since 13356
+     */
+    public static InputStream openStream(URL url) throws IOException {
+        switch (url.getProtocol()) {
+            case "http":
+            case "https":
+                return HttpClient.create(url).connect().getContent();
+            case "jar":
+                try {
+                    return url.openStream();
+                } catch (FileNotFoundException e) {
+                    // Workaround to https://bugs.openjdk.java.net/browse/JDK-4523159
+                    String urlPath = url.getPath();
+                    if (urlPath.startsWith("file:/") && urlPath.split("!").length > 2) {
+                        try {
+                            // Locate jar file
+                            int index = urlPath.lastIndexOf("!/");
+                            Path jarFile = Paths.get(urlPath.substring("file:/".length(), index));
+                            Path filename = jarFile.getFileName();
+                            FileTime jarTime = Files.readAttributes(jarFile, BasicFileAttributes.class).lastModifiedTime();
+                            // Copy it to temp directory (hopefully free of exclamation mark) if needed (missing or older jar)
+                            Path jarCopy = Paths.get(System.getProperty("java.io.tmpdir")).resolve(filename);
+                            if (!jarCopy.toFile().exists() ||
+                                    Files.readAttributes(jarCopy, BasicFileAttributes.class).lastModifiedTime().compareTo(jarTime) < 0) {
+                                Files.copy(jarFile, jarCopy, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
+                            }
+                            // Open the stream using the copy
+                            return new URL(url.getProtocol() + ':' + jarCopy.toUri().toURL().toExternalForm() + urlPath.substring(index))
+                                    .openStream();
+                        } catch (RuntimeException | IOException ex) {
+                            Logging.warn(ex);
+                        }
+                    }
+                    throw e;
+                }
+            case "file":
+            default:
+                return url.openStream();
+        }
+    }
 }
diff --git a/src/org/tukaani/xz/ArrayCache.java b/src/org/tukaani/xz/ArrayCache.java
new file mode 100644
index 0000000..c940d77
--- /dev/null
+++ b/src/org/tukaani/xz/ArrayCache.java
@@ -0,0 +1,172 @@
+/*
+ * ArrayCache
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+/**
+ * Caches large arrays for reuse (base class and a dummy cache implementation).
+ * <p>
+ * When compressing or decompressing many (very) small files in a row, the
+ * time spent in construction of new compressor or decompressor objects
+ * can be longer than the time spent in actual compression or decompression.
+ * A large part of this initialization overhead comes from allocation and
+ * garbage collection of large arrays.
+ * <p>
+ * The {@code ArrayCache} API provides a way to cache large array allocations
+ * for reuse. It can give a major performance improvement when compressing or
+ * decompressing many tiny files. If you are only (de)compressing one or two
+ * files or the files a very big, array caching won't improve anything,
+ * although it won't make anything slower either.
+ * <p>
+ * <b>Important: The users of ArrayCache don't return the allocated arrays
+ * back to the cache in all situations.</b>
+ * This a reason why it's called a cache instead of a pool.
+ * If it is important to be able to return every array back to a cache,
+ * {@link ResettableArrayCache} can be useful.
+ * <p>
+ * In compressors (OutputStreams) the arrays are returned to the cache
+ * when a call to {@code finish()} or {@code close()} returns
+ * successfully (no exceptions are thrown).
+ * <p>
+ * In decompressors (InputStreams) the arrays are returned to the cache when
+ * the decompression is successfully finished ({@code read} returns {@code -1})
+ * or {@code close()} or {@code close(boolean)} is called. This is true even
+ * if closing throws an exception.
+ * <p>
+ * Raw decompressors don't support {@code close(boolean)}. With raw
+ * decompressors, if one wants to put the arrays back to the cache without
+ * closing the underlying {@code InputStream}, one can wrap the
+ * {@code InputStream} into {@link CloseIgnoringInputStream} when creating
+ * the decompressor instance. Then one can use {@code close()}.
+ * <p>
+ * Different cache implementations can be extended from this base class.
+ * All cache implementations must be thread safe.
+ * <p>
+ * This class also works as a dummy cache that simply calls {@code new}
+ * to allocate new arrays and doesn't try to cache anything. A statically
+ * allocated dummy cache is available via {@link #getDummyCache()}.
+ * <p>
+ * If no {@code ArrayCache} is specified when constructing a compressor or
+ * decompressor, the default {@code ArrayCache} implementation is used.
+ * See {@link #getDefaultCache()} and {@link #setDefaultCache(ArrayCache)}.
+ * <p>
+ * This is a class instead of an interface because it's possible that in the
+ * future we may want to cache other array types too. New methods can be
+ * added to this class without breaking existing cache implementations.
+ *
+ * @since 1.7
+ *
+ * @see BasicArrayCache
+ */
+public class ArrayCache {
+    /**
+     * Global dummy cache instance that is returned by {@code getDummyCache()}.
+     */
+    private static final ArrayCache dummyCache = new ArrayCache();
+
+    /**
+     * Global default {@code ArrayCache} that is used when no other cache has
+     * been specified.
+     */
+    private static volatile ArrayCache defaultCache = dummyCache;
+
+    /**
+     * Returns a statically-allocated {@code ArrayCache} instance.
+     * It can be shared by all code that needs a dummy cache.
+     */
+    public static ArrayCache getDummyCache() {
+        return dummyCache;
+    }
+
+    /**
+     * Gets the default {@code ArrayCache} instance.
+     * This is a global cache that is used when the application
+     * specifies nothing else. The default is a dummy cache
+     * (see {@link #getDummyCache()}).
+     */
+    public static ArrayCache getDefaultCache() {
+        // It's volatile so no need for synchronization.
+        return defaultCache;
+    }
+
+    /**
+     * Sets the default {@code ArrayCache} instance.
+     * Use with care. Other libraries using this package probably shouldn't
+     * call this function as libraries cannot know if there are other users
+     * of the xz package in the same application.
+     */
+    public static void setDefaultCache(ArrayCache arrayCache) {
+        if (arrayCache == null)
+            throw new NullPointerException();
+
+        // It's volatile so no need for synchronization.
+        defaultCache = arrayCache;
+    }
+
+    /**
+     * Creates a new {@code ArrayCache} that does no caching
+     * (a dummy cache). If you need a dummy cache, you may want to call
+     * {@link #getDummyCache()} instead.
+     */
+    public ArrayCache() {}
+
+    /**
+     * Allocates a new byte array.
+     * <p>
+     * This implementation simply returns {@code new byte[size]}.
+     *
+     * @param   size            the minimum size of the array to allocate;
+     *                          an implementation may return an array that
+     *                          is larger than the given {@code size}
+     *
+     * @param   fillWithZeros   if true, the caller expects that the first
+     *                          {@code size} elements in the array are zero;
+     *                          if false, the array contents can be anything,
+     *                          which speeds things up when reusing a cached
+     *                          array
+     */
+    public byte[] getByteArray(int size, boolean fillWithZeros) {
+        return new byte[size];
+    }
+
+    /**
+     * Puts the given byte array to the cache. The caller must no longer
+     * use the array.
+     * <p>
+     * This implementation does nothing.
+     */
+    public void putArray(byte[] array) {}
+
+    /**
+     * Allocates a new int array.
+     * <p>
+     * This implementation simply returns {@code new int[size]}.
+     *
+     * @param   size            the minimum size of the array to allocate;
+     *                          an implementation may return an array that
+     *                          is larger than the given {@code size}
+     *
+     * @param   fillWithZeros   if true, the caller expects that the first
+     *                          {@code size} elements in the array are zero;
+     *                          if false, the array contents can be anything,
+     *                          which speeds things up when reusing a cached
+     *                          array
+     */
+    public int[] getIntArray(int size, boolean fillWithZeros) {
+        return new int[size];
+    }
+
+    /**
+     * Puts the given int array to the cache. The caller must no longer
+     * use the array.
+     * <p>
+     * This implementation does nothing.
+     */
+    public void putArray(int[] array) {}
+}
diff --git a/src/org/tukaani/xz/BCJCoder.java b/src/org/tukaani/xz/BCJCoder.java
new file mode 100644
index 0000000..81862f7
--- /dev/null
+++ b/src/org/tukaani/xz/BCJCoder.java
@@ -0,0 +1,35 @@
+/*
+ * BCJCoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+abstract class BCJCoder implements FilterCoder {
+    public static final long X86_FILTER_ID = 0x04;
+    public static final long POWERPC_FILTER_ID = 0x05;
+    public static final long IA64_FILTER_ID = 0x06;
+    public static final long ARM_FILTER_ID = 0x07;
+    public static final long ARMTHUMB_FILTER_ID = 0x08;
+    public static final long SPARC_FILTER_ID = 0x09;
+
+    public static boolean isBCJFilterID(long filterID) {
+        return filterID >= 0x04 && filterID <= 0x09;
+    }
+
+    public boolean changesSize() {
+        return false;
+    }
+
+    public boolean nonLastOK() {
+        return true;
+    }
+
+    public boolean lastOK() {
+        return false;
+    }
+}
diff --git a/src/org/tukaani/xz/BCJDecoder.java b/src/org/tukaani/xz/BCJDecoder.java
new file mode 100644
index 0000000..31251f2
--- /dev/null
+++ b/src/org/tukaani/xz/BCJDecoder.java
@@ -0,0 +1,62 @@
+/*
+ * BCJDecoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+import org.tukaani.xz.simple.*;
+
+class BCJDecoder extends BCJCoder implements FilterDecoder {
+    private final long filterID;
+    private final int startOffset;
+
+    BCJDecoder(long filterID, byte[] props)
+            throws UnsupportedOptionsException {
+        assert isBCJFilterID(filterID);
+        this.filterID = filterID;
+
+        if (props.length == 0) {
+            startOffset = 0;
+        } else if (props.length == 4) {
+            int n = 0;
+            for (int i = 0; i < 4; ++i)
+                n |= (props[i] & 0xFF) << (i * 8);
+
+            startOffset = n;
+        } else {
+            throw new UnsupportedOptionsException(
+                    "Unsupported BCJ filter properties");
+        }
+    }
+
+    public int getMemoryUsage() {
+        return SimpleInputStream.getMemoryUsage();
+    }
+
+    public InputStream getInputStream(InputStream in, ArrayCache arrayCache) {
+        SimpleFilter simpleFilter = null;
+
+        if (filterID == X86_FILTER_ID)
+            simpleFilter = new X86(false, startOffset);
+        else if (filterID == POWERPC_FILTER_ID)
+            simpleFilter = new PowerPC(false, startOffset);
+        else if (filterID == IA64_FILTER_ID)
+            simpleFilter = new IA64(false, startOffset);
+        else if (filterID == ARM_FILTER_ID)
+            simpleFilter = new ARM(false, startOffset);
+        else if (filterID == ARMTHUMB_FILTER_ID)
+            simpleFilter = new ARMThumb(false, startOffset);
+        else if (filterID == SPARC_FILTER_ID)
+            simpleFilter = new SPARC(false, startOffset);
+        else
+            assert false;
+
+        return new SimpleInputStream(in, simpleFilter);
+    }
+}
diff --git a/src/org/tukaani/xz/BasicArrayCache.java b/src/org/tukaani/xz/BasicArrayCache.java
new file mode 100644
index 0000000..90ebe1f
--- /dev/null
+++ b/src/org/tukaani/xz/BasicArrayCache.java
@@ -0,0 +1,281 @@
+/*
+ * BasicArrayCache
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * A basic {@link ArrayCache} implementation.
+ * <p>
+ * This caches exact array sizes, that is, {@code getByteArray} will return
+ * an array whose size is exactly the requested size. A limited number
+ * of different array sizes are cached at the same time; least recently used
+ * sizes will be dropped from the cache if needed (can happen if several
+ * different (de)compression options are used with the same cache).
+ * <p>
+ * The current implementation uses
+ * {@link java.util.LinkedHashMap LinkedHashMap} to map different array sizes
+ * to separate array-based data structures which hold
+ * {@link java.lang.ref.SoftReference SoftReferences} to the cached arrays.
+ * In the common case this should give good performance and fairly low
+ * memory usage overhead.
+ * <p>
+ * A statically allocated global {@code BasicArrayCache} instance is
+ * available via {@link #getInstance()} which is a good choice in most
+ * situations where caching is wanted.
+ *
+ * @since 1.7
+ */
+public class BasicArrayCache extends ArrayCache {
+    /**
+     * Arrays smaller than this many elements will not be cached.
+     */
+    private static final int CACHEABLE_SIZE_MIN = 32 << 10;
+
+    /**
+     * Number of stacks i.e. how many different array sizes to cache.
+     */
+    private static final int STACKS_MAX = 32;
+
+    /**
+     * Number of arrays of the same type and size to keep in the cache.
+     * (ELEMENTS_PER_STACK - 1) is used as a bit mask so ELEMENTS_PER_STACK
+     * must be a power of two!
+     */
+    private static final int ELEMENTS_PER_STACK = 512;
+
+    /**
+     * A thread-safe stack-like data structure whose {@code push} method
+     * overwrites the oldest element in the stack if the stack is full.
+     */
+    private static class CyclicStack<T> {
+        /**
+         * Array that holds the elements in the cyclic stack.
+         */
+        @SuppressWarnings("unchecked")
+        private final T[] elements = (T[])new Object[ELEMENTS_PER_STACK];
+
+        /**
+         * Read-write position in the {@code refs} array.
+         * The most recently added element is in {@code refs[pos]}.
+         * If it is {@code null}, then the stack is empty and all
+         * elements in {@code refs} are {@code null}.
+         * <p>
+         * Note that {@code pop()} always modifies {@code pos}, even if
+         * the stack is empty. This means that when the first element is
+         * added by {@code push(T)}, it can get added in any position in
+         * {@code refs} and the stack will start growing from there.
+         */
+        private int pos = 0;
+
+        /**
+         * Gets the most recently added element from the stack.
+         * If the stack is empty, {@code null} is returned.
+         */
+        public synchronized T pop() {
+            T e = elements[pos];
+            elements[pos] = null;
+            pos = (pos - 1) & (ELEMENTS_PER_STACK - 1);
+            return e;
+        }
+
+        /**
+         * Adds a new element to the stack. If the stack is full, the oldest
+         * element is overwritten.
+         */
+        public synchronized void push(T e) {
+            pos = (pos + 1) & (ELEMENTS_PER_STACK - 1);
+            elements[pos] = e;
+        }
+    }
+
+    /**
+     * Maps Integer (array size) to stacks of references to arrays. At most
+     * STACKS_MAX number of stacks are kept in the map (LRU cache).
+     */
+    private static class CacheMap<T>
+            extends LinkedHashMap<Integer, CyclicStack<Reference<T>>> {
+        /**
+         * This class won't be serialized but this is needed
+         * to silence a compiler warning.
+         */
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * Creates a new CacheMap.
+         */
+        public CacheMap() {
+            // The map may momentarily have at most STACKS_MAX + 1 entries
+            // when put(K,V) has inserted a new entry but hasn't called
+            // removeEldestEntry yet. Using 2 * STACKS_MAX as the initial
+            // (and the final) capacity should give good performance. 0.75 is
+            // the default load factor and in this case it guarantees that
+            // the map will never need to be rehashed because
+            // (STACKS_MAX + 1) / 0.75 < 2 * STACKS_MAX.
+            //
+            // That last argument is true to get LRU cache behavior together
+            // with the overriden removeEldestEntry method.
+            super(2 * STACKS_MAX, 0.75f, true);
+        }
+
+        /**
+         * Returns true if the map is full and the least recently used stack
+         * should be removed.
+         */
+        protected boolean removeEldestEntry(
+                Map.Entry<Integer, CyclicStack<Reference<T>>> eldest) {
+            return size() > STACKS_MAX;
+        }
+    }
+
+    /**
+     * Helper class for the singleton instance.
+     * This is allocated only if {@code getInstance()} is called.
+     */
+    private static final class LazyHolder {
+        static final BasicArrayCache INSTANCE = new BasicArrayCache();
+    }
+
+    /**
+     * Returns a statically-allocated {@code BasicArrayCache} instance.
+     * This is often a good choice when a cache is needed.
+     */
+    public static BasicArrayCache getInstance() {
+        return LazyHolder.INSTANCE;
+    }
+
+    /**
+     * Stacks for cached byte arrays.
+     */
+    private final CacheMap<byte[]> byteArrayCache = new CacheMap<byte[]>();
+
+    /**
+     * Stacks for cached int arrays.
+     */
+    private final CacheMap<int[]> intArrayCache = new CacheMap<int[]>();
+
+    /**
+     * Gets {@code T[size]} from the given {@code cache}.
+     * If no such array is found, {@code null} is returned.
+     */
+    private static <T> T getArray(CacheMap<T> cache, int size) {
+        // putArray doesn't add small arrays to the cache and so it's
+        // pointless to look for small arrays here.
+        if (size < CACHEABLE_SIZE_MIN)
+            return null;
+
+        // Try to find a stack that holds arrays of T[size].
+        CyclicStack<Reference<T>> stack;
+        synchronized(cache) {
+            stack = cache.get(size);
+        }
+
+        if (stack == null)
+            return null;
+
+        // Try to find a non-cleared Reference from the stack.
+        T array;
+        do {
+            Reference<T> r = stack.pop();
+            if (r == null)
+                return null;
+
+            array = r.get();
+        } while (array == null);
+
+        return array;
+    }
+
+    /**
+     * Puts the {@code array} of {@code size} elements long into
+     * the {@code cache}.
+     */
+    private static <T> void putArray(CacheMap<T> cache, T array, int size) {
+        // Small arrays aren't cached.
+        if (size < CACHEABLE_SIZE_MIN)
+            return;
+
+        CyclicStack<Reference<T>> stack;
+
+        synchronized(cache) {
+            // Get a stack that holds arrays of T[size]. If no such stack
+            // exists, allocate a new one. If the cache already had STACKS_MAX
+            // number of stacks, the least recently used stack is removed by
+            // cache.put (it calls removeEldestEntry).
+            stack = cache.get(size);
+            if (stack == null) {
+                stack = new CyclicStack<Reference<T>>();
+                cache.put(size, stack);
+            }
+        }
+
+        stack.push(new SoftReference<T>(array));
+    }
+
+    /**
+     * Allocates a new byte array, hopefully reusing an existing
+     * array from the cache.
+     *
+     * @param       size        size of the array to allocate
+     *
+     * @param       fillWithZeros
+     *                          if true, all the elements of the returned
+     *                          array will be zero; if false, the contents
+     *                          of the returned array is undefined
+     */
+    public byte[] getByteArray(int size, boolean fillWithZeros) {
+        byte[] array = getArray(byteArrayCache, size);
+
+        if (array == null)
+            array = new byte[size];
+        else if (fillWithZeros)
+            Arrays.fill(array, (byte)0x00);
+
+        return array;
+    }
+
+    /**
+     * Puts the given byte array to the cache. The caller must no longer
+     * use the array.
+     * <p>
+     * Small arrays aren't cached and will be ignored by this method.
+     */
+    public void putArray(byte[] array) {
+        putArray(byteArrayCache, array, array.length);
+    }
+
+    /**
+     * This is like getByteArray but for int arrays.
+     */
+    public int[] getIntArray(int size, boolean fillWithZeros) {
+        int[] array = getArray(intArrayCache, size);
+
+        if (array == null)
+            array = new int[size];
+        else if (fillWithZeros)
+            Arrays.fill(array, 0);
+
+        return array;
+    }
+
+    /**
+     * Puts the given int array to the cache. The caller must no longer
+     * use the array.
+     * <p>
+     * Small arrays aren't cached and will be ignored by this method.
+     */
+    public void putArray(int[] array) {
+        putArray(intArrayCache, array, array.length);
+    }
+}
diff --git a/src/org/tukaani/xz/BlockInputStream.java b/src/org/tukaani/xz/BlockInputStream.java
new file mode 100644
index 0000000..1931bd6
--- /dev/null
+++ b/src/org/tukaani/xz/BlockInputStream.java
@@ -0,0 +1,305 @@
+/*
+ * BlockInputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+import java.io.DataInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import org.tukaani.xz.common.DecoderUtil;
+import org.tukaani.xz.check.Check;
+
+class BlockInputStream extends InputStream {
+    private final DataInputStream inData;
+    private final CountingInputStream inCounted;
+    private InputStream filterChain;
+    private final Check check;
+    private final boolean verifyCheck;
+
+    private long uncompressedSizeInHeader = -1;
+    private long compressedSizeInHeader = -1;
+    private long compressedSizeLimit;
+    private final int headerSize;
+    private long uncompressedSize = 0;
+    private boolean endReached = false;
+
+    private final byte[] tempBuf = new byte[1];
+
+    public BlockInputStream(InputStream in,
+                            Check check, boolean verifyCheck,
+                            int memoryLimit,
+                            long unpaddedSizeInIndex,
+                            long uncompressedSizeInIndex,
+                            ArrayCache arrayCache)
+            throws IOException, IndexIndicatorException {
+        this.check = check;
+        this.verifyCheck = verifyCheck;
+        inData = new DataInputStream(in);
+
+        byte[] buf = new byte[DecoderUtil.BLOCK_HEADER_SIZE_MAX];
+
+        // Block Header Size or Index Indicator
+        inData.readFully(buf, 0, 1);
+
+        // See if this begins the Index field.
+        if (buf[0] == 0x00)
+            throw new IndexIndicatorException();
+
+        // Read the rest of the Block Header.
+        headerSize = 4 * ((buf[0] & 0xFF) + 1);
+        inData.readFully(buf, 1, headerSize - 1);
+
+        // Validate the CRC32.
+        if (!DecoderUtil.isCRC32Valid(buf, 0, headerSize - 4, headerSize - 4))
+            throw new CorruptedInputException("XZ Block Header is corrupt");
+
+        // Check for reserved bits in Block Flags.
+        if ((buf[1] & 0x3C) != 0)
+            throw new UnsupportedOptionsException(
+                    "Unsupported options in XZ Block Header");
+
+        // Memory for the Filter Flags field
+        int filterCount = (buf[1] & 0x03) + 1;
+        long[] filterIDs = new long[filterCount];
+        byte[][] filterProps = new byte[filterCount][];
+
+        // Use a stream to parse the fields after the Block Flags field.
+        // Exclude the CRC32 field at the end.
+        ByteArrayInputStream bufStream = new ByteArrayInputStream(
+                buf, 2, headerSize - 6);
+
+        try {
+            // Set the maximum valid compressed size. This is overriden
+            // by the value from the Compressed Size field if it is present.
+            compressedSizeLimit = (DecoderUtil.VLI_MAX & ~3)
+                                  - headerSize - check.getSize();
+
+            // Decode and validate Compressed Size if the relevant flag
+            // is set in Block Flags.
+            if ((buf[1] & 0x40) != 0x00) {
+                compressedSizeInHeader = DecoderUtil.decodeVLI(bufStream);
+
+                if (compressedSizeInHeader == 0
+                        || compressedSizeInHeader > compressedSizeLimit)
+                    throw new CorruptedInputException();
+
+                compressedSizeLimit = compressedSizeInHeader;
+            }
+
+            // Decode Uncompressed Size if the relevant flag is set
+            // in Block Flags.
+            if ((buf[1] & 0x80) != 0x00)
+                uncompressedSizeInHeader = DecoderUtil.decodeVLI(bufStream);
+
+            // Decode Filter Flags.
+            for (int i = 0; i < filterCount; ++i) {
+                filterIDs[i] = DecoderUtil.decodeVLI(bufStream);
+
+                long filterPropsSize = DecoderUtil.decodeVLI(bufStream);
+                if (filterPropsSize > bufStream.available())
+                    throw new CorruptedInputException();
+
+                filterProps[i] = new byte[(int)filterPropsSize];
+                bufStream.read(filterProps[i]);
+            }
+
+        } catch (IOException e) {
+            throw new CorruptedInputException("XZ Block Header is corrupt");
+        }
+
+        // Check that the remaining bytes are zero.
+        for (int i = bufStream.available(); i > 0; --i)
+            if (bufStream.read() != 0x00)
+                throw new UnsupportedOptionsException(
+                        "Unsupported options in XZ Block Header");
+
+        // Validate the Blcok Header against the Index when doing
+        // random access reading.
+        if (unpaddedSizeInIndex != -1) {
+            // Compressed Data must be at least one byte, so if Block Header
+            // and Check alone take as much or more space than the size
+            // stored in the Index, the file is corrupt.
+            int headerAndCheckSize = headerSize + check.getSize();
+            if (headerAndCheckSize >= unpaddedSizeInIndex)
+                throw new CorruptedInputException(
+                        "XZ Index does not match a Block Header");
+
+            // The compressed size calculated from Unpadded Size must
+            // match the value stored in the Compressed Size field in
+            // the Block Header.
+            long compressedSizeFromIndex
+                    = unpaddedSizeInIndex - headerAndCheckSize;
+            if (compressedSizeFromIndex > compressedSizeLimit
+                    || (compressedSizeInHeader != -1
+                        && compressedSizeInHeader != compressedSizeFromIndex))
+                throw new CorruptedInputException(
+                        "XZ Index does not match a Block Header");
+
+            // The uncompressed size stored in the Index must match
+            // the value stored in the Uncompressed Size field in
+            // the Block Header.
+            if (uncompressedSizeInHeader != -1
+                    && uncompressedSizeInHeader != uncompressedSizeInIndex)
+                throw new CorruptedInputException(
+                        "XZ Index does not match a Block Header");
+
+            // For further validation, pretend that the values from the Index
+            // were stored in the Block Header.
+            compressedSizeLimit = compressedSizeFromIndex;
+            compressedSizeInHeader = compressedSizeFromIndex;
+            uncompressedSizeInHeader = uncompressedSizeInIndex;
+        }
+
+        // Check if the Filter IDs are supported, decode
+        // the Filter Properties, and check that they are
+        // supported by this decoder implementation.
+        FilterDecoder[] filters = new FilterDecoder[filterIDs.length];
+
+        for (int i = 0; i < filters.length; ++i) {
+            if (filterIDs[i] == LZMA2Coder.FILTER_ID)
+                filters[i] = new LZMA2Decoder(filterProps[i]);
+
+            else if (filterIDs[i] == DeltaCoder.FILTER_ID)
+                filters[i] = new DeltaDecoder(filterProps[i]);
+
+            else if (BCJDecoder.isBCJFilterID(filterIDs[i]))
+                filters[i] = new BCJDecoder(filterIDs[i], filterProps[i]);
+
+            else
+                throw new UnsupportedOptionsException(
+                        "Unknown Filter ID " + filterIDs[i]);
+        }
+
+        RawCoder.validate(filters);
+
+        // Check the memory usage limit.
+        if (memoryLimit >= 0) {
+            int memoryNeeded = 0;
+            for (int i = 0; i < filters.length; ++i)
+                memoryNeeded += filters[i].getMemoryUsage();
+
+            if (memoryNeeded > memoryLimit)
+                throw new MemoryLimitException(memoryNeeded, memoryLimit);
+        }
+
+        // Use an input size counter to calculate
+        // the size of the Compressed Data field.
+        inCounted = new CountingInputStream(in);
+
+        // Initialize the filter chain.
+        filterChain = inCounted;
+        for (int i = filters.length - 1; i >= 0; --i)
+            filterChain = filters[i].getInputStream(filterChain, arrayCache);
+    }
+
+    public int read() throws IOException {
+        return read(tempBuf, 0, 1) == -1 ? -1 : (tempBuf[0] & 0xFF);
+    }
+
+    public int read(byte[] buf, int off, int len) throws IOException {
+        if (endReached)
+            return -1;
+
+        int ret = filterChain.read(buf, off, len);
+
+        if (ret > 0) {
+            if (verifyCheck)
+                check.update(buf, off, ret);
+
+            uncompressedSize += ret;
+
+            // Catch invalid values.
+            long compressedSize = inCounted.getSize();
+            if (compressedSize < 0
+                    || compressedSize > compressedSizeLimit
+                    || uncompressedSize < 0
+                    || (uncompressedSizeInHeader != -1
+                        && uncompressedSize > uncompressedSizeInHeader))
+                throw new CorruptedInputException();
+
+            // Check the Block integrity as soon as possible:
+            //   - The filter chain shouldn't return less than requested
+            //     unless it hit the end of the input.
+            //   - If the uncompressed size is known, we know when there
+            //     shouldn't be more data coming. We still need to read
+            //     one byte to let the filter chain catch errors and to
+            //     let it read end of payload marker(s).
+            if (ret < len || uncompressedSize == uncompressedSizeInHeader) {
+                if (filterChain.read() != -1)
+                    throw new CorruptedInputException();
+
+                validate();
+                endReached = true;
+            }
+        } else if (ret == -1) {
+            validate();
+            endReached = true;
+        }
+
+        return ret;
+    }
+
+    private void validate() throws IOException {
+        long compressedSize = inCounted.getSize();
+
+        // Validate Compressed Size and Uncompressed Size if they were
+        // present in Block Header.
+        if ((compressedSizeInHeader != -1
+                    && compressedSizeInHeader != compressedSize)
+                || (uncompressedSizeInHeader != -1
+                    && uncompressedSizeInHeader != uncompressedSize))
+            throw new CorruptedInputException();
+
+        // Block Padding bytes must be zeros.
+        while ((compressedSize++ & 3) != 0)
+            if (inData.readUnsignedByte() != 0x00)
+                throw new CorruptedInputException();
+
+        // Validate the integrity check if verifyCheck is true.
+        byte[] storedCheck = new byte[check.getSize()];
+        inData.readFully(storedCheck);
+        if (verifyCheck && !Arrays.equals(check.finish(), storedCheck))
+            throw new CorruptedInputException("Integrity check ("
+                    + check.getName() + ") does not match");
+    }
+
+    public int available() throws IOException {
+        return filterChain.available();
+    }
+
+    public void close() {
+        // This puts all arrays, that were allocated from ArrayCache,
+        // back to the ArrayCache. The last filter in the chain will
+        // call inCounted.close() which, being an instance of
+        // CloseIgnoringInputStream, won't close() the InputStream that
+        // was provided by the application.
+        try {
+            filterChain.close();
+        } catch (IOException e) {
+            // It's a bug if we get here. The InputStreams that we are closing
+            // are all from this package and they are known to not throw
+            // IOException. (They could throw an IOException if we were
+            // closing the application-supplied InputStream, but
+            // inCounted.close() doesn't do that.)
+            assert false;
+        }
+
+        filterChain = null;
+    }
+
+    public long getUnpaddedSize() {
+        return headerSize + inCounted.getSize() + check.getSize();
+    }
+
+    public long getUncompressedSize() {
+        return uncompressedSize;
+    }
+}
diff --git a/src/org/tukaani/xz/BlockOutputStream.java b/src/org/tukaani/xz/BlockOutputStream.java
new file mode 100644
index 0000000..8ac4407
--- /dev/null
+++ b/src/org/tukaani/xz/BlockOutputStream.java
@@ -0,0 +1,135 @@
+/*
+ * BlockOutputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import org.tukaani.xz.common.EncoderUtil;
+import org.tukaani.xz.check.Check;
+
+class BlockOutputStream extends FinishableOutputStream {
+    private final OutputStream out;
+    private final CountingOutputStream outCounted;
+    private FinishableOutputStream filterChain;
+    private final Check check;
+
+    private final int headerSize;
+    private final long compressedSizeLimit;
+    private long uncompressedSize = 0;
+
+    private final byte[] tempBuf = new byte[1];
+
+    public BlockOutputStream(OutputStream out, FilterEncoder[] filters,
+                             Check check, ArrayCache arrayCache)
+            throws IOException {
+        this.out = out;
+        this.check = check;
+
+        // Initialize the filter chain.
+        outCounted = new CountingOutputStream(out);
+        filterChain = outCounted;
+        for (int i = filters.length - 1; i >= 0; --i)
+            filterChain = filters[i].getOutputStream(filterChain, arrayCache);
+
+        // Prepare to encode the Block Header field.
+        ByteArrayOutputStream bufStream = new ByteArrayOutputStream();
+
+        // Write a dummy Block Header Size field. The real value is written
+        // once everything else except CRC32 has been written.
+        bufStream.write(0x00);
+
+        // Write Block Flags. Storing Compressed Size or Uncompressed Size
+        // isn't supported for now.
+        bufStream.write(filters.length - 1);
+
+        // List of Filter Flags
+        for (int i = 0; i < filters.length; ++i) {
+            EncoderUtil.encodeVLI(bufStream, filters[i].getFilterID());
+            byte[] filterProps = filters[i].getFilterProps();
+            EncoderUtil.encodeVLI(bufStream, filterProps.length);
+            bufStream.write(filterProps);
+        }
+
+        // Header Padding
+        while ((bufStream.size() & 3) != 0)
+            bufStream.write(0x00);
+
+        byte[] buf = bufStream.toByteArray();
+
+        // Total size of the Block Header: Take the size of the CRC32 field
+        // into account.
+        headerSize = buf.length + 4;
+
+        // This is just a sanity check.
+        if (headerSize > EncoderUtil.BLOCK_HEADER_SIZE_MAX)
+            throw new UnsupportedOptionsException();
+
+        // Block Header Size
+        buf[0] = (byte)(buf.length / 4);
+
+        // Write the Block Header field to the output stream.
+        out.write(buf);
+        EncoderUtil.writeCRC32(out, buf);
+
+        // Calculate the maximum allowed size of the Compressed Data field.
+        // It is hard to exceed it so this is mostly to be pedantic.
+        compressedSizeLimit = (EncoderUtil.VLI_MAX & ~3)
+                              - headerSize - check.getSize();
+    }
+
+    public void write(int b) throws IOException {
+        tempBuf[0] = (byte)b;
+        write(tempBuf, 0, 1);
+    }
+
+    public void write(byte[] buf, int off, int len) throws IOException {
+        filterChain.write(buf, off, len);
+        check.update(buf, off, len);
+        uncompressedSize += len;
+        validate();
+    }
+
+    public void flush() throws IOException {
+        filterChain.flush();
+        validate();
+    }
+
+    public void finish() throws IOException {
+        // Finish the Compressed Data field.
+        filterChain.finish();
+        validate();
+
+        // Block Padding
+        for (long i = outCounted.getSize(); (i & 3) != 0; ++i)
+            out.write(0x00);
+
+        // Check
+        out.write(check.finish());
+    }
+
+    private void validate() throws IOException {
+        long compressedSize = outCounted.getSize();
+
+        // It is very hard to trigger this exception.
+        // This is just to be pedantic.
+        if (compressedSize < 0 || compressedSize > compressedSizeLimit
+                || uncompressedSize < 0)
+            throw new XZIOException("XZ Stream has grown too big");
+    }
+
+    public long getUnpaddedSize() {
+        return headerSize + outCounted.getSize() + check.getSize();
+    }
+
+    public long getUncompressedSize() {
+        return uncompressedSize;
+    }
+}
diff --git a/src/org/tukaani/xz/CloseIgnoringInputStream.java b/src/org/tukaani/xz/CloseIgnoringInputStream.java
new file mode 100644
index 0000000..db68ddb
--- /dev/null
+++ b/src/org/tukaani/xz/CloseIgnoringInputStream.java
@@ -0,0 +1,48 @@
+/*
+ * CloseIgnoringInputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+import java.io.FilterInputStream;
+
+/**
+ * An {@code InputStream} wrapper whose {@code close()} does nothing.
+ * This is useful with raw decompressors if you want to call
+ * {@code close()} to release memory allocated from an {@link ArrayCache}
+ * but don't want to close the underlying {@code InputStream}.
+ * For example:
+ * <p><blockquote><pre>
+ * InputStream rawdec = new LZMA2InputStream(
+ *         new CloseIgnoringInputStream(myInputStream),
+ *         myDictSize, null, myArrayCache);
+ * doSomething(rawdec);
+ * rawdec.close(); // This doesn't close myInputStream.
+ * </pre></blockquote>
+ * <p>
+ * With {@link XZInputStream}, {@link SingleXZInputStream}, and
+ * {@link SeekableXZInputStream} you can use their {@code close(boolean)}
+ * method to avoid closing the underlying {@code InputStream}; with
+ * those classes {@code CloseIgnoringInputStream} isn't needed.
+ *
+ * @since 1.7
+ */
+public class CloseIgnoringInputStream extends FilterInputStream {
+    /**
+     * Creates a new {@code CloseIgnoringInputStream}.
+     */
+    public CloseIgnoringInputStream(InputStream in) {
+        super(in);
+    }
+
+    /**
+     * This does nothing (doesn't call {@code in.close()}).
+     */
+    public void close() {}
+}
diff --git a/src/org/tukaani/xz/CorruptedInputException.java b/src/org/tukaani/xz/CorruptedInputException.java
new file mode 100644
index 0000000..d7d9520
--- /dev/null
+++ b/src/org/tukaani/xz/CorruptedInputException.java
@@ -0,0 +1,37 @@
+/*
+ * CorruptedInputException
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+/**
+ * Thrown when the compressed input data is corrupt.
+ * However, it is possible that some or all of the data
+ * already read from the input stream was corrupt too.
+ */
+public class CorruptedInputException extends XZIOException {
+    private static final long serialVersionUID = 3L;
+
+    /**
+     * Creates a new CorruptedInputException with
+     * the default error detail message.
+     */
+    public CorruptedInputException() {
+        super("Compressed data is corrupt");
+    }
+
+    /**
+     * Creates a new CorruptedInputException with
+     * the specified error detail message.
+     *
+     * @param       s           error detail message
+     */
+    public CorruptedInputException(String s) {
+        super(s);
+    }
+}
diff --git a/src/org/tukaani/xz/CountingInputStream.java b/src/org/tukaani/xz/CountingInputStream.java
new file mode 100644
index 0000000..8599f97
--- /dev/null
+++ b/src/org/tukaani/xz/CountingInputStream.java
@@ -0,0 +1,47 @@
+/*
+ * CountingInputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.FilterInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+
+/**
+ * Counts the number of bytes read from an input stream.
+ * The <code>close()</code> method does nothing, that is, the underlying
+ * <code>InputStream</code> isn't closed.
+ */
+class CountingInputStream extends CloseIgnoringInputStream {
+    private long size = 0;
+
+    public CountingInputStream(InputStream in) {
+        super(in);
+    }
+
+    public int read() throws IOException {
+        int ret = in.read();
+        if (ret != -1 && size >= 0)
+            ++size;
+
+        return ret;
+    }
+
+    public int read(byte[] b, int off, int len) throws IOException {
+        int ret = in.read(b, off, len);
+        if (ret > 0 && size >= 0)
+            size += ret;
+
+        return ret;
+    }
+
+    public long getSize() {
+        return size;
+    }
+}
diff --git a/src/org/tukaani/xz/CountingOutputStream.java b/src/org/tukaani/xz/CountingOutputStream.java
new file mode 100644
index 0000000..9b3eef3
--- /dev/null
+++ b/src/org/tukaani/xz/CountingOutputStream.java
@@ -0,0 +1,54 @@
+/*
+ * CountingOutputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.OutputStream;
+import java.io.IOException;
+
+/**
+ * Counts the number of bytes written to an output stream.
+ * <p>
+ * The <code>finish</code> method does nothing.
+ * This is <code>FinishableOutputStream</code> instead
+ * of <code>OutputStream</code> solely because it allows
+ * using this as the output stream for a chain of raw filters.
+ */
+class CountingOutputStream extends FinishableOutputStream {
+    private final OutputStream out;
+    private long size = 0;
+
+    public CountingOutputStream(OutputStream out) {
+        this.out = out;
+    }
+
+    public void write(int b) throws IOException {
+        out.write(b);
+        if (size >= 0)
+            ++size;
+    }
+
+    public void write(byte[] b, int off, int len) throws IOException {
+        out.write(b, off, len);
+        if (size >= 0)
+            size += len;
+    }
+
+    public void flush() throws IOException {
+        out.flush();
+    }
+
+    public void close() throws IOException {
+        out.close();
+    }
+
+    public long getSize() {
+        return size;
+    }
+}
diff --git a/src/org/tukaani/xz/DeltaCoder.java b/src/org/tukaani/xz/DeltaCoder.java
new file mode 100644
index 0000000..808834c
--- /dev/null
+++ b/src/org/tukaani/xz/DeltaCoder.java
@@ -0,0 +1,26 @@
+/*
+ * DeltaCoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+abstract class DeltaCoder implements FilterCoder {
+    public static final long FILTER_ID = 0x03;
+
+    public boolean changesSize() {
+        return false;
+    }
+
+    public boolean nonLastOK() {
+        return true;
+    }
+
+    public boolean lastOK() {
+        return false;
+    }
+}
diff --git a/src/org/tukaani/xz/DeltaDecoder.java b/src/org/tukaani/xz/DeltaDecoder.java
new file mode 100644
index 0000000..4d21ca2
--- /dev/null
+++ b/src/org/tukaani/xz/DeltaDecoder.java
@@ -0,0 +1,32 @@
+/*
+ * DeltaDecoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+
+class DeltaDecoder extends DeltaCoder implements FilterDecoder {
+    private final int distance;
+
+    DeltaDecoder(byte[] props) throws UnsupportedOptionsException {
+        if (props.length != 1)
+            throw new UnsupportedOptionsException(
+                    "Unsupported Delta filter properties");
+
+        distance = (props[0] & 0xFF) + 1;
+    }
+
+    public int getMemoryUsage() {
+        return 1;
+    }
+
+    public InputStream getInputStream(InputStream in, ArrayCache arrayCache) {
+        return new DeltaInputStream(in, distance);
+    }
+}
diff --git a/src/org/tukaani/xz/DeltaEncoder.java b/src/org/tukaani/xz/DeltaEncoder.java
new file mode 100644
index 0000000..86ba9ea
--- /dev/null
+++ b/src/org/tukaani/xz/DeltaEncoder.java
@@ -0,0 +1,37 @@
+/*
+ * DeltaEncoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+class DeltaEncoder extends DeltaCoder implements FilterEncoder {
+    private final DeltaOptions options;
+    private final byte[] props = new byte[1];
+
+    DeltaEncoder(DeltaOptions options) {
+        props[0] = (byte)(options.getDistance() - 1);
+        this.options = (DeltaOptions)options.clone();
+    }
+
+    public long getFilterID() {
+        return FILTER_ID;
+    }
+
+    public byte[] getFilterProps() {
+        return props;
+    }
+
+    public boolean supportsFlushing() {
+        return true;
+    }
+
+    public FinishableOutputStream getOutputStream(FinishableOutputStream out,
+                                                  ArrayCache arrayCache) {
+        return options.getOutputStream(out, arrayCache);
+    }
+}
diff --git a/src/org/tukaani/xz/DeltaInputStream.java b/src/org/tukaani/xz/DeltaInputStream.java
new file mode 100644
index 0000000..56478f5
--- /dev/null
+++ b/src/org/tukaani/xz/DeltaInputStream.java
@@ -0,0 +1,146 @@
+/*
+ * DeltaInputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+import java.io.IOException;
+import org.tukaani.xz.delta.DeltaDecoder;
+
+/**
+ * Decodes raw Delta-filtered data (no XZ headers).
+ * <p>
+ * The delta filter doesn't change the size of the data and thus it
+ * cannot have an end-of-payload marker. It will simply decode until
+ * its input stream indicates end of input.
+ */
+public class DeltaInputStream extends InputStream {
+    /**
+     * Smallest supported delta calculation distance.
+     */
+    public static final int DISTANCE_MIN = 1;
+
+    /**
+     * Largest supported delta calculation distance.
+     */
+    public static final int DISTANCE_MAX = 256;
+
+    private InputStream in;
+    private final DeltaDecoder delta;
+
+    private IOException exception = null;
+
+    private final byte[] tempBuf = new byte[1];
+
+    /**
+     * Creates a new Delta decoder with the given delta calculation distance.
+     *
+     * @param       in          input stream from which Delta filtered data
+     *                          is read
+     *
+     * @param       distance    delta calculation distance, must be in the
+     *                          range [<code>DISTANCE_MIN</code>,
+     *                          <code>DISTANCE_MAX</code>]
+     */
+    public DeltaInputStream(InputStream in, int distance) {
+        // Check for null because otherwise null isn't detect
+        // in this constructor.
+        if (in == null)
+            throw new NullPointerException();
+
+        this.in = in;
+        this.delta = new DeltaDecoder(distance);
+    }
+
+    /**
+     * Decode the next byte from this input stream.
+     *
+     * @return      the next decoded byte, or <code>-1</code> to indicate
+     *              the end of input on the input stream <code>in</code>
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     */
+    public int read() throws IOException {
+        return read(tempBuf, 0, 1) == -1 ? -1 : (tempBuf[0] & 0xFF);
+    }
+
+    /**
+     * Decode into an array of bytes.
+     * <p>
+     * This calls <code>in.read(buf, off, len)</code> and defilters the
+     * returned data.
+     *
+     * @param       buf         target buffer for decoded data
+     * @param       off         start offset in <code>buf</code>
+     * @param       len         maximum number of bytes to read
+     *
+     * @return      number of bytes read, or <code>-1</code> to indicate
+     *              the end of the input stream <code>in</code>
+     *
+     * @throws      XZIOException if the stream has been closed
+     *
+     * @throws      IOException may be thrown by underlaying input
+     *                          stream <code>in</code>
+     */
+    public int read(byte[] buf, int off, int len) throws IOException {
+        if (len == 0)
+            return 0;
+
+        if (in == null)
+            throw new XZIOException("Stream closed");
+
+        if (exception != null)
+            throw exception;
+
+        int size;
+        try {
+            size = in.read(buf, off, len);
+        } catch (IOException e) {
+            exception = e;
+            throw e;
+        }
+
+        if (size == -1)
+            return -1;
+
+        delta.decode(buf, off, size);
+        return size;
+    }
+
+    /**
+     * Calls <code>in.available()</code>.
+     *
+     * @return      the value returned by <code>in.available()</code>
+     */
+    public int available() throws IOException {
+        if (in == null)
+            throw new XZIOException("Stream closed");
+
+        if (exception != null)
+            throw exception;
+
+        return in.available();
+    }
+
+    /**
+     * Closes the stream and calls <code>in.close()</code>.
+     * If the stream was already closed, this does nothing.
+     *
+     * @throws  IOException if thrown by <code>in.close()</code>
+     */
+    public void close() throws IOException {
+        if (in != null) {
+            try {
+                in.close();
+            } finally {
+                in = null;
+            }
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/DeltaOptions.java b/src/org/tukaani/xz/DeltaOptions.java
new file mode 100644
index 0000000..fac74d9
--- /dev/null
+++ b/src/org/tukaani/xz/DeltaOptions.java
@@ -0,0 +1,103 @@
+/*
+ * DeltaOptions
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+
+/**
+ * Delta filter options. The Delta filter can be used only as a non-last
+ * filter in the chain, for example Delta + LZMA2.
+ * <p>
+ * Currently only simple byte-wise delta is supported. The only option
+ * is the delta distance, which you should set to match your data.
+ * It's not possible to provide a generic default value for it.
+ * <p>
+ * For example, with distance = 2 and eight-byte input
+ * A1 B1 A2 B3 A3 B5 A4 B7, the output will be A1 B1 01 02 01 02 01 02.
+ * <p>
+ * The Delta filter can be good with uncompressed bitmap images. It can
+ * also help with PCM audio, although special-purpose compressors like
+ * FLAC will give much smaller result at much better compression speed.
+ */
+public class DeltaOptions extends FilterOptions {
+    /**
+     * Smallest supported delta calculation distance.
+     */
+    public static final int DISTANCE_MIN = 1;
+
+    /**
+     * Largest supported delta calculation distance.
+     */
+    public static final int DISTANCE_MAX = 256;
+
+    private int distance = DISTANCE_MIN;
+
+    /**
+     * Creates new Delta options and sets the delta distance to 1 byte.
+     */
+    public DeltaOptions() {}
+
+    /**
+     * Creates new Delta options and sets the distance to the given value.
+     */
+    public DeltaOptions(int distance) throws UnsupportedOptionsException {
+        setDistance(distance);
+    }
+
+    /**
+     * Sets the delta distance in bytes. The new distance must be in
+     * the range [DISTANCE_MIN, DISTANCE_MAX].
+     */
+    public void setDistance(int distance) throws UnsupportedOptionsException {
+        if (distance < DISTANCE_MIN || distance > DISTANCE_MAX)
+            throw new UnsupportedOptionsException(
+                    "Delta distance must be in the range [" + DISTANCE_MIN
+                    + ", " + DISTANCE_MAX + "]: " + distance);
+
+        this.distance = distance;
+    }
+
+    /**
+     * Gets the delta distance.
+     */
+    public int getDistance() {
+        return distance;
+    }
+
+    public int getEncoderMemoryUsage() {
+        return DeltaOutputStream.getMemoryUsage();
+    }
+
+    public FinishableOutputStream getOutputStream(FinishableOutputStream out,
+                                                  ArrayCache arrayCache) {
+        return new DeltaOutputStream(out, this);
+    }
+
+    public int getDecoderMemoryUsage() {
+        return 1;
+    }
+
+    public InputStream getInputStream(InputStream in, ArrayCache arrayCache) {
+        return new DeltaInputStream(in, distance);
+    }
+
+    FilterEncoder getFilterEncoder() {
+        return new DeltaEncoder(this);
+    }
+
+    public Object clone() {
+        try {
+            return super.clone();
+        } catch (CloneNotSupportedException e) {
+            assert false;
+            throw new RuntimeException();
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/DeltaOutputStream.java b/src/org/tukaani/xz/DeltaOutputStream.java
new file mode 100644
index 0000000..bd880db
--- /dev/null
+++ b/src/org/tukaani/xz/DeltaOutputStream.java
@@ -0,0 +1,113 @@
+/*
+ * DeltaOutputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.IOException;
+import org.tukaani.xz.delta.DeltaEncoder;
+
+class DeltaOutputStream extends FinishableOutputStream {
+    private static final int FILTER_BUF_SIZE = 4096;
+
+    private FinishableOutputStream out;
+    private final DeltaEncoder delta;
+    private final byte[] filterBuf = new byte[FILTER_BUF_SIZE];
+
+    private boolean finished = false;
+    private IOException exception = null;
+
+    private final byte[] tempBuf = new byte[1];
+
+    static int getMemoryUsage() {
+        return 1 + FILTER_BUF_SIZE / 1024;
+    }
+
+    DeltaOutputStream(FinishableOutputStream out, DeltaOptions options) {
+        this.out = out;
+        delta = new DeltaEncoder(options.getDistance());
+    }
+
+    public void write(int b) throws IOException {
+        tempBuf[0] = (byte)b;
+        write(tempBuf, 0, 1);
+    }
+
+    public void write(byte[] buf, int off, int len) throws IOException {
+        if (off < 0 || len < 0 || off + len < 0 || off + len > buf.length)
+            throw new IndexOutOfBoundsException();
+
+        if (exception != null)
+            throw exception;
+
+        if (finished)
+            throw new XZIOException("Stream finished");
+
+        try {
+            while (len > FILTER_BUF_SIZE) {
+                delta.encode(buf, off, FILTER_BUF_SIZE, filterBuf);
+                out.write(filterBuf);
+                off += FILTER_BUF_SIZE;
+                len -= FILTER_BUF_SIZE;
+            }
+
+            delta.encode(buf, off, len, filterBuf);
+            out.write(filterBuf, 0, len);
+        } catch (IOException e) {
+            exception = e;
+            throw e;
+        }
+    }
+
+    public void flush() throws IOException {
+        if (exception != null)
+            throw exception;
+
+        if (finished)
+            throw new XZIOException("Stream finished or closed");
+
+        try {
+            out.flush();
+        } catch (IOException e) {
+            exception = e;
+            throw e;
+        }
+    }
+
+    public void finish() throws IOException {
+        if (!finished) {
+            if (exception != null)
+                throw exception;
+
+            try {
+                out.finish();
+            } catch (IOException e) {
+                exception = e;
+                throw e;
+            }
+
+            finished = true;
+        }
+    }
+
+    public void close() throws IOException {
+        if (out != null) {
+            try {
+                out.close();
+            } catch (IOException e) {
+                if (exception == null)
+                    exception = e;
+            }
+
+            out = null;
+        }
+
+        if (exception != null)
+            throw exception;
+    }
+}
diff --git a/src/org/tukaani/xz/FilterCoder.java b/src/org/tukaani/xz/FilterCoder.java
new file mode 100644
index 0000000..1e95e37
--- /dev/null
+++ b/src/org/tukaani/xz/FilterCoder.java
@@ -0,0 +1,16 @@
+/*
+ * FilterCoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+interface FilterCoder {
+    boolean changesSize();
+    boolean nonLastOK();
+    boolean lastOK();
+}
diff --git a/src/org/tukaani/xz/FilterDecoder.java b/src/org/tukaani/xz/FilterDecoder.java
new file mode 100644
index 0000000..6ec2f83
--- /dev/null
+++ b/src/org/tukaani/xz/FilterDecoder.java
@@ -0,0 +1,17 @@
+/*
+ * FilterDecoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+
+interface FilterDecoder extends FilterCoder {
+    int getMemoryUsage();
+    InputStream getInputStream(InputStream in, ArrayCache arrayCache);
+}
diff --git a/src/org/tukaani/xz/FilterEncoder.java b/src/org/tukaani/xz/FilterEncoder.java
new file mode 100644
index 0000000..b40575e
--- /dev/null
+++ b/src/org/tukaani/xz/FilterEncoder.java
@@ -0,0 +1,18 @@
+/*
+ * FilterEncoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+interface FilterEncoder extends FilterCoder {
+    long getFilterID();
+    byte[] getFilterProps();
+    boolean supportsFlushing();
+    FinishableOutputStream getOutputStream(FinishableOutputStream out,
+                                           ArrayCache arrayCache);
+}
diff --git a/src/org/tukaani/xz/FilterOptions.java b/src/org/tukaani/xz/FilterOptions.java
new file mode 100644
index 0000000..34f4450
--- /dev/null
+++ b/src/org/tukaani/xz/FilterOptions.java
@@ -0,0 +1,104 @@
+/*
+ * FilterOptions
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+/**
+ * Base class for filter-specific options classes.
+ */
+public abstract class FilterOptions implements Cloneable {
+    /**
+     * Gets how much memory the encoder will need with
+     * the given filter chain. This function simply calls
+     * <code>getEncoderMemoryUsage()</code> for every filter
+     * in the array and returns the sum of the returned values.
+     */
+    public static int getEncoderMemoryUsage(FilterOptions[] options) {
+        int m = 0;
+
+        for (int i = 0; i < options.length; ++i)
+            m += options[i].getEncoderMemoryUsage();
+
+        return m;
+    }
+
+    /**
+     * Gets how much memory the decoder will need with
+     * the given filter chain. This function simply calls
+     * <code>getDecoderMemoryUsage()</code> for every filter
+     * in the array and returns the sum of the returned values.
+     */
+    public static int getDecoderMemoryUsage(FilterOptions[] options) {
+        int m = 0;
+
+        for (int i = 0; i < options.length; ++i)
+            m += options[i].getDecoderMemoryUsage();
+
+        return m;
+    }
+
+    /**
+     * Gets how much memory the encoder will need with these options.
+     */
+    public abstract int getEncoderMemoryUsage();
+
+    /**
+     * Gets a raw (no XZ headers) encoder output stream using these options.
+     * Raw streams are an advanced feature. In most cases you want to store
+     * the compressed data in the .xz container format instead of using
+     * a raw stream. To use this filter in a .xz file, pass this object
+     * to XZOutputStream.
+     * <p>
+     * This is uses ArrayCache.getDefaultCache() as the ArrayCache.
+     */
+    public FinishableOutputStream getOutputStream(FinishableOutputStream out) {
+        return getOutputStream(out, ArrayCache.getDefaultCache());
+    }
+
+    /**
+     * Gets a raw (no XZ headers) encoder output stream using these options
+     * and the given ArrayCache.
+     * Raw streams are an advanced feature. In most cases you want to store
+     * the compressed data in the .xz container format instead of using
+     * a raw stream. To use this filter in a .xz file, pass this object
+     * to XZOutputStream.
+     */
+    public abstract FinishableOutputStream getOutputStream(
+            FinishableOutputStream out, ArrayCache arrayCache);
+
+    /**
+     * Gets how much memory the decoder will need to decompress the data
+     * that was encoded with these options.
+     */
+    public abstract int getDecoderMemoryUsage();
+
+    /**
+     * Gets a raw (no XZ headers) decoder input stream using these options.
+     * <p>
+     * This is uses ArrayCache.getDefaultCache() as the ArrayCache.
+     */
+    public InputStream getInputStream(InputStream in) throws IOException {
+        return getInputStream(in, ArrayCache.getDefaultCache());
+    }
+
+    /**
+     * Gets a raw (no XZ headers) decoder input stream using these options
+     * and the given ArrayCache.
+     */
+    public abstract InputStream getInputStream(
+            InputStream in, ArrayCache arrayCache) throws IOException;
+
+    abstract FilterEncoder getFilterEncoder();
+
+    FilterOptions() {}
+}
diff --git a/src/org/tukaani/xz/FinishableOutputStream.java b/src/org/tukaani/xz/FinishableOutputStream.java
new file mode 100644
index 0000000..64d4ca5
--- /dev/null
+++ b/src/org/tukaani/xz/FinishableOutputStream.java
@@ -0,0 +1,31 @@
+/*
+ * FinishableOutputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.OutputStream;
+import java.io.IOException;
+
+/**
+ * Output stream that supports finishing without closing
+ * the underlying stream.
+ */
+public abstract class FinishableOutputStream extends OutputStream {
+    /**
+     * Finish the stream without closing the underlying stream.
+     * No more data may be written to the stream after finishing.
+     * <p>
+     * The <code>finish</code> method of <code>FinishableOutputStream</code>
+     * does nothing. Subclasses should override it if they need finishing
+     * support, which is the case, for example, with compressors.
+     *
+     * @throws      IOException
+     */
+    public void finish() throws IOException {}
+}
diff --git a/src/org/tukaani/xz/IndexIndicatorException.java b/src/org/tukaani/xz/IndexIndicatorException.java
new file mode 100644
index 0000000..fc6bc03
--- /dev/null
+++ b/src/org/tukaani/xz/IndexIndicatorException.java
@@ -0,0 +1,14 @@
+/*
+ * IndexIndicatorException
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+class IndexIndicatorException extends Exception {
+    private static final long serialVersionUID = 1L;
+}
diff --git a/src/org/tukaani/xz/LZMA2Coder.java b/src/org/tukaani/xz/LZMA2Coder.java
new file mode 100644
index 0000000..b0963b7
--- /dev/null
+++ b/src/org/tukaani/xz/LZMA2Coder.java
@@ -0,0 +1,26 @@
+/*
+ * LZMA2Coder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+abstract class LZMA2Coder implements FilterCoder {
+    public static final long FILTER_ID = 0x21;
+
+    public boolean changesSize() {
+        return true;
+    }
+
+    public boolean nonLastOK() {
+        return false;
+    }
+
+    public boolean lastOK() {
+        return true;
+    }
+}
diff --git a/src/org/tukaani/xz/LZMA2Decoder.java b/src/org/tukaani/xz/LZMA2Decoder.java
new file mode 100644
index 0000000..71c1c90
--- /dev/null
+++ b/src/org/tukaani/xz/LZMA2Decoder.java
@@ -0,0 +1,35 @@
+/*
+ * LZMA2Decoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+
+class LZMA2Decoder extends LZMA2Coder implements FilterDecoder {
+    private int dictSize;
+
+    LZMA2Decoder(byte[] props) throws UnsupportedOptionsException {
+        // Up to 1.5 GiB dictionary is supported. The bigger ones
+        // are too big for int.
+        if (props.length != 1 || (props[0] & 0xFF) > 37)
+            throw new UnsupportedOptionsException(
+                    "Unsupported LZMA2 properties");
+
+        dictSize = 2 | (props[0] & 1);
+        dictSize <<= (props[0] >>> 1) + 11;
+    }
+
+    public int getMemoryUsage() {
+        return LZMA2InputStream.getMemoryUsage(dictSize);
+    }
+
+    public InputStream getInputStream(InputStream in, ArrayCache arrayCache) {
+        return new LZMA2InputStream(in, dictSize, null, arrayCache);
+    }
+}
diff --git a/src/org/tukaani/xz/LZMA2Encoder.java b/src/org/tukaani/xz/LZMA2Encoder.java
new file mode 100644
index 0000000..6f3cab4
--- /dev/null
+++ b/src/org/tukaani/xz/LZMA2Encoder.java
@@ -0,0 +1,51 @@
+/*
+ * LZMA2Encoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import org.tukaani.xz.lzma.LZMAEncoder;
+
+class LZMA2Encoder extends LZMA2Coder implements FilterEncoder {
+    private final LZMA2Options options;
+    private final byte[] props = new byte[1];
+
+    LZMA2Encoder(LZMA2Options options) {
+        if (options.getPresetDict() != null)
+            throw new IllegalArgumentException(
+                    "XZ doesn't support a preset dictionary for now");
+
+        if (options.getMode() == LZMA2Options.MODE_UNCOMPRESSED) {
+            props[0] = (byte)0;
+        } else {
+            int d = Math.max(options.getDictSize(),
+                             LZMA2Options.DICT_SIZE_MIN);
+            props[0] = (byte)(LZMAEncoder.getDistSlot(d - 1) - 23);
+        }
+
+        // Make a private copy so that the caller is free to change its copy.
+        this.options = (LZMA2Options)options.clone();
+    }
+
+    public long getFilterID() {
+        return FILTER_ID;
+    }
+
+    public byte[] getFilterProps() {
+        return props;
+    }
+
+    public boolean supportsFlushing() {
+        return true;
+    }
+
+    public FinishableOutputStream getOutputStream(FinishableOutputStream out,
+                                                  ArrayCache arrayCache) {
+        return options.getOutputStream(out, arrayCache);
+    }
+}
diff --git a/src/org/tukaani/xz/LZMA2InputStream.java b/src/org/tukaani/xz/LZMA2InputStream.java
new file mode 100644
index 0000000..9708052
--- /dev/null
+++ b/src/org/tukaani/xz/LZMA2InputStream.java
@@ -0,0 +1,400 @@
+/*
+ * LZMA2InputStream
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import org.tukaani.xz.lz.LZDecoder;
+import org.tukaani.xz.rangecoder.RangeDecoderFromBuffer;
+import org.tukaani.xz.lzma.LZMADecoder;
+
+/**
+ * Decompresses a raw LZMA2 stream (no XZ headers).
+ */
+public class LZMA2InputStream extends InputStream {
+    /**
+     * Smallest valid LZMA2 dictionary size.
+     * <p>
+     * Very tiny dictionaries would be a performance problem, so
+     * the minimum is 4 KiB.
+     */
+    public static final int DICT_SIZE_MIN = 4096;
+
+    /**
+     * Largest dictionary size supported by this implementation.
+     * <p>
+     * The LZMA2 algorithm allows dictionaries up to one byte less than 4 GiB.
+     * This implementation supports only 16 bytes less than 2 GiB for raw
+     * LZMA2 streams, and for .xz files the maximum is 1.5 GiB. This
+     * limitation is due to Java using signed 32-bit integers for array
+     * indexing. The limitation shouldn't matter much in practice since so
+     * huge dictionaries are not normally used.
+     */
+    public static final int DICT_SIZE_MAX = Integer.MAX_VALUE & ~15;
+
+    private static final int COMPRESSED_SIZE_MAX = 1 << 16;
+
+    private final ArrayCache arrayCache;
+    private DataInputStream in;
+
+    private LZDecoder lz;
+    private RangeDecoderFromBuffer rc;
+    private LZMADecoder lzma;
+
+    private int uncompressedSize = 0;
+    private boolean isLZMAChunk = false;
+
+    private boolean needDictReset = true;
+    private boolean needProps = true;
+    private boolean endReached = false;
+
+    private IOException exception = null;
+
+    private final byte[] tempBuf = new byte[1];
+
+    /**
+     * Gets approximate decompressor memory requirements as kibibytes for
+     * the given dictionary size.
+     *
+     * @param       dictSize    LZMA2 dictionary size as bytes, must be
+     *                          in the range [<code>DICT_SIZE_MIN</code>,
+     *                          <code>DICT_SIZE_MAX</code>]
+     *
+     * @return      approximate memory requirements as kibibytes (KiB)
+     */
+    public static int getMemoryUsage(int dictSize) {
+        // The base state is around 30-40 KiB (probabilities etc.),
+        // range decoder needs COMPRESSED_SIZE_MAX bytes for buffering,
+        // and LZ decoder needs a dictionary buffer.
+        return 40 + COMPRESSED_SIZE_MAX / 1024 + getDictSize(dictSize) / 1024;
+    }
+
+    private static int getDictSize(int dictSize) {
+        if (dictSize < DICT_SIZE_MIN || dictSize > DICT_SIZE_MAX)
+            throw new IllegalArgumentException(
+                    "Unsupported dictionary size " + dictSize);
+
+        // Round dictionary size upward to a multiple of 16. This way LZMA
+        // can use LZDecoder.getPos() for calculating LZMA's posMask.
+        // Note that this check is needed only for raw LZMA2 streams; it is
+        // redundant with .xz.
+        return (dictSize + 15) & ~15;
+    }
+
+    /**
+     * Creates a new input stream that decompresses raw LZMA2 data
+     * from <code>in</code>.
+     * <p>
+     * The caller needs to know the dictionary size used when compressing;
+     * the dictionary size isn't stored as part of a raw LZMA2 stream.
+     * <p>
+     * Specifying a too small dictionary size will prevent decompressing
+     * the stream. Specifying a too big dictionary is waste of memory but
+     * decompression will work.
+     * <p>
+     * There is no need to specify a dictionary bigger than
+     * the uncompressed size of the data even if a bigger dictionary
+     * was used when compressing. If you know the uncompressed size
+     * of the data, this might allow saving some memory.
+     *
+     * @param       in          input stream from which LZMA2-compressed
+     *                          data is read
+     *
+     * @param       dictSize    LZMA2 dictionary size as bytes, must be
+     *                          in the range [<code>DICT_SIZE_MIN</code>,
+     *                          <code>DICT_SIZE_MAX</code>]
+     */
+    public LZMA2InputStream(InputStream in, int dictSize) {
+        this(in, dictSize, null);
+    }
+
+    /**
+     * Creates a new LZMA2 decompressor using a preset dictionary.
+     * <p>
+     * This is like <code>LZMA2InputStream(InputStream, int)</code> except
+     * that the dictionary may be initialized using a preset dictionary.
+     * If a preset dictionary was used when compressing the data, the
+     * same preset dictionary must be provided when decompressing.
+     *
+     * @param       in          input stream from which LZMA2-compressed
+     *                          data is read
+     *
+     * @param       dictSize    LZMA2 dictionary size as bytes, must be
+     *                          in the range [<code>DICT_SIZE_MIN</code>,
+     *                          <code>DICT_SIZE_MAX</code>]
+     *
+     * @param       presetDict  preset dictionary or <code>null</code>
+     *                          to use no preset dictionary
+     */
+    public LZMA2InputStream(InputStream in, int dictSize, byte[] presetDict) {
+        this(in, dictSize, presetDict, ArrayCache.getDefaultCache());
+    }
+
+    /**
+     * Creates a new LZMA2 decompressor using a preset dictionary
+     * and array cache.
+     * <p>
+     * This is like <code>LZMA2InputStream(InputStream, int, byte[])</code>
+     * except that this also takes the <code>arrayCache</code> argument.
+     *
+     * @param       in          input stream from which LZMA2-compressed
+     *                          data is read
+     *
+     * @param       dictSize    LZMA2 dictionary size as bytes, must be
+     *                          in the range [<code>DICT_SIZE_MIN</code>,
+     *                          <code>DICT_SIZE_MAX</code>]
+     *
+     * @param       presetDict  preset dictionary or <code>null</code>
+     *                          to use no preset dictionary
+     *
+     * @param       arrayCache  cache to be used for allocating large arrays
+     *
+     * @since 1.7
+     */
+    LZMA2InputStream(InputStream in, int dictSize, byte[] presetDict,
+                     ArrayCache arrayCache) {
+        // Check for null because otherwise null isn't detect
+        // in this constructor.
+        if (in == null)
+            throw new NullPointerException();
+
+        this.arrayCache = arrayCache;
+        this.in = new DataInputStream(in);
+        this.rc = new RangeDecoderFromBuffer(COMPRESSED_SIZE_MAX, arrayCache);
+        this.lz = new LZDecoder(getDictSize(dictSize), presetDict, arrayCache);
+
+        if (presetDict != null && presetDict.length > 0)
+            needDictReset = false;
+    }
+
+    /**
+     * Decompresses the next byte from this input stream.
+     * <p>
+     * Reading lots of data with <code>read()</code> from this input stream
+     * may be inefficient. Wrap it in <code>java.io.BufferedInputStream</code>
+     * if you need to read lots of data one byte at a time.
+     *
+     * @return      the next decompressed byte, or <code>-1</code>
+     *              to indicate the end of the compressed stream
+     *
+     * @throws      CorruptedInputException
+     *
+     * @throws      XZIOException if the stream has been closed
+     *
+     * @throws      EOFException
+     *                          compressed input is truncated or corrupt
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     */
+    public int read() throws IOException {
+        return read(tempBuf, 0, 1) == -1 ? -1 : (tempBuf[0] & 0xFF);
+    }
+
+    /**
+     * Decompresses into an array of bytes.
+     * <p>
+     * If <code>len</code> is zero, no bytes are read and <code>0</code>
+     * is returned. Otherwise this will block until <code>len</code>
+     * bytes have been decompressed, the end of the LZMA2 stream is reached,
+     * or an exception is thrown.
+     *
+     * @param       buf         target buffer for uncompressed data
+     * @param       off         start offset in <code>buf</code>
+     * @param       len         maximum number of uncompressed bytes to read
+     *
+     * @return      number of bytes read, or <code>-1</code> to indicate
+     *              the end of the compressed stream
+     *
+     * @throws      CorruptedInputException
+     *
+     * @throws      XZIOException if the stream has been closed
+     *
+     * @throws      EOFException
+     *                          compressed input is truncated or corrupt
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     */
+    public int read(byte[] buf, int off, int len) throws IOException {
+        if (off < 0 || len < 0 || off + len < 0 || off + len > buf.length)
+            throw new IndexOutOfBoundsException();
+
+        if (len == 0)
+            return 0;
+
+        if (in == null)
+            throw new XZIOException("Stream closed");
+
+        if (exception != null)
+            throw exception;
+
+        if (endReached)
+            return -1;
+
+        try {
+            int size = 0;
+
+            while (len > 0) {
+                if (uncompressedSize == 0) {
+                    decodeChunkHeader();
+                    if (endReached)
+                        return size == 0 ? -1 : size;
+                }
+
+                int copySizeMax = Math.min(uncompressedSize, len);
+
+                if (!isLZMAChunk) {
+                    lz.copyUncompressed(in, copySizeMax);
+                } else {
+                    lz.setLimit(copySizeMax);
+                    lzma.decode();
+                }
+
+                int copiedSize = lz.flush(buf, off);
+                off += copiedSize;
+                len -= copiedSize;
+                size += copiedSize;
+                uncompressedSize -= copiedSize;
+
+                if (uncompressedSize == 0)
+                    if (!rc.isFinished() || lz.hasPending())
+                        throw new CorruptedInputException();
+            }
+
+            return size;
+
+        } catch (IOException e) {
+            exception = e;
+            throw e;
+        }
+    }
+
+    private void decodeChunkHeader() throws IOException {
+        int control = in.readUnsignedByte();
+
+        if (control == 0x00) {
+            endReached = true;
+            putArraysToCache();
+            return;
+        }
+
+        if (control >= 0xE0 || control == 0x01) {
+            needProps = true;
+            needDictReset = false;
+            lz.reset();
+        } else if (needDictReset) {
+            throw new CorruptedInputException();
+        }
+
+        if (control >= 0x80) {
+            isLZMAChunk = true;
+
+            uncompressedSize = (control & 0x1F) << 16;
+            uncompressedSize += in.readUnsignedShort() + 1;
+
+            int compressedSize = in.readUnsignedShort() + 1;
+
+            if (control >= 0xC0) {
+                needProps = false;
+                decodeProps();
+
+            } else if (needProps) {
+                throw new CorruptedInputException();
+
+            } else if (control >= 0xA0) {
+                lzma.reset();
+            }
+
+            rc.prepareInputBuffer(in, compressedSize);
+
+        } else if (control > 0x02) {
+            throw new CorruptedInputException();
+
+        } else {
+            isLZMAChunk = false;
+            uncompressedSize = in.readUnsignedShort() + 1;
+        }
+    }
+
+    private void decodeProps() throws IOException {
+        int props = in.readUnsignedByte();
+
+        if (props > (4 * 5 + 4) * 9 + 8)
+            throw new CorruptedInputException();
+
+        int pb = props / (9 * 5);
+        props -= pb * 9 * 5;
+        int lp = props / 9;
+        int lc = props - lp * 9;
+
+        if (lc + lp > 4)
+            throw new CorruptedInputException();
+
+        lzma = new LZMADecoder(lz, rc, lc, lp, pb);
+    }
+
+    /**
+     * Returns the number of uncompressed bytes that can be read
+     * without blocking. The value is returned with an assumption
+     * that the compressed input data will be valid. If the compressed
+     * data is corrupt, <code>CorruptedInputException</code> may get
+     * thrown before the number of bytes claimed to be available have
+     * been read from this input stream.
+     * <p>
+     * In LZMA2InputStream, the return value will be non-zero when the
+     * decompressor is in the middle of an LZMA2 chunk. The return value
+     * will then be the number of uncompressed bytes remaining from that
+     * chunk. The return value can also be non-zero in the middle of
+     * an uncompressed chunk, but then the return value depends also on
+     * the <code>available()</code> method of the underlying InputStream.
+     *
+     * @return      the number of uncompressed bytes that can be read
+     *              without blocking
+     */
+    public int available() throws IOException {
+        if (in == null)
+            throw new XZIOException("Stream closed");
+
+        if (exception != null)
+            throw exception;
+
+        return isLZMAChunk ? uncompressedSize
+                           : Math.min(uncompressedSize, in.available());
+    }
+
+    private void putArraysToCache() {
+        if (lz != null) {
+            lz.putArraysToCache(arrayCache);
+            lz = null;
+
+            rc.putArraysToCache(arrayCache);
+            rc = null;
+        }
+    }
+
+    /**
+     * Closes the stream and calls <code>in.close()</code>.
+     * If the stream was already closed, this does nothing.
+     *
+     * @throws  IOException if thrown by <code>in.close()</code>
+     */
+    public void close() throws IOException {
+        if (in != null) {
+            putArraysToCache();
+
+            try {
+                in.close();
+            } finally {
+                in = null;
+            }
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/LZMA2Options.java b/src/org/tukaani/xz/LZMA2Options.java
new file mode 100644
index 0000000..21e186e
--- /dev/null
+++ b/src/org/tukaani/xz/LZMA2Options.java
@@ -0,0 +1,583 @@
+/*
+ * LZMA2Options
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+import java.io.IOException;
+import org.tukaani.xz.lz.LZEncoder;
+import org.tukaani.xz.lzma.LZMAEncoder;
+
+/**
+ * LZMA2 compression options.
+ * <p>
+ * While this allows setting the LZMA2 compression options in detail,
+ * often you only need <code>LZMA2Options()</code> or
+ * <code>LZMA2Options(int)</code>.
+ */
+public class LZMA2Options extends FilterOptions {
+    /**
+     * Minimum valid compression preset level is 0.
+     */
+    public static final int PRESET_MIN = 0;
+
+    /**
+     * Maximum valid compression preset level is 9.
+     */
+    public static final int PRESET_MAX = 9;
+
+    /**
+     * Default compression preset level is 6.
+     */
+    public static final int PRESET_DEFAULT = 6;
+
+    /**
+     * Minimum dictionary size is 4 KiB.
+     */
+    public static final int DICT_SIZE_MIN = 4096;
+
+    /**
+     * Maximum dictionary size for compression is 768 MiB.
+     * <p>
+     * The decompressor supports bigger dictionaries, up to almost 2 GiB.
+     * With HC4 the encoder would support dictionaries bigger than 768 MiB.
+     * The 768 MiB limit comes from the current implementation of BT4 where
+     * we would otherwise hit the limits of signed ints in array indexing.
+     * <p>
+     * If you really need bigger dictionary for decompression,
+     * use {@link LZMA2InputStream} directly.
+     */
+    public static final int DICT_SIZE_MAX = 768 << 20;
+
+    /**
+     * The default dictionary size is 8 MiB.
+     */
+    public static final int DICT_SIZE_DEFAULT = 8 << 20;
+
+    /**
+     * Maximum value for lc + lp is 4.
+     */
+    public static final int LC_LP_MAX = 4;
+
+    /**
+     * The default number of literal context bits is 3.
+     */
+    public static final int LC_DEFAULT = 3;
+
+    /**
+     * The default number of literal position bits is 0.
+     */
+    public static final int LP_DEFAULT = 0;
+
+    /**
+     * Maximum value for pb is 4.
+     */
+    public static final int PB_MAX = 4;
+
+    /**
+     * The default number of position bits is 2.
+     */
+    public static final int PB_DEFAULT = 2;
+
+    /**
+     * Compression mode: uncompressed.
+     * The data is wrapped into a LZMA2 stream without compression.
+     */
+    public static final int MODE_UNCOMPRESSED = 0;
+
+    /**
+     * Compression mode: fast.
+     * This is usually combined with a hash chain match finder.
+     */
+    public static final int MODE_FAST = LZMAEncoder.MODE_FAST;
+
+    /**
+     * Compression mode: normal.
+     * This is usually combined with a binary tree match finder.
+     */
+    public static final int MODE_NORMAL = LZMAEncoder.MODE_NORMAL;
+
+    /**
+     * Minimum value for <code>niceLen</code> is 8.
+     */
+    public static final int NICE_LEN_MIN = 8;
+
+    /**
+     * Maximum value for <code>niceLen</code> is 273.
+     */
+    public static final int NICE_LEN_MAX = 273;
+
+    /**
+     * Match finder: Hash Chain 2-3-4
+     */
+    public static final int MF_HC4 = LZEncoder.MF_HC4;
+
+    /**
+     * Match finder: Binary tree 2-3-4
+     */
+    public static final int MF_BT4 = LZEncoder.MF_BT4;
+
+    private static final int[] presetToDictSize = {
+            1 << 18, 1 << 20, 1 << 21, 1 << 22, 1 << 22,
+            1 << 23, 1 << 23, 1 << 24, 1 << 25, 1 << 26 };
+
+    private static final int[] presetToDepthLimit = { 4, 8, 24, 48 };
+
+    private int dictSize;
+    private byte[] presetDict = null;
+    private int lc;
+    private int lp;
+    private int pb;
+    private int mode;
+    private int niceLen;
+    private int mf;
+    private int depthLimit;
+
+    /**
+     * Creates new LZMA2 options and sets them to the default values.
+     * This is equivalent to <code>LZMA2Options(PRESET_DEFAULT)</code>.
+     */
+    public LZMA2Options() {
+        try {
+            setPreset(PRESET_DEFAULT);
+        } catch (UnsupportedOptionsException e) {
+            assert false;
+            throw new RuntimeException();
+        }
+    }
+
+    /**
+     * Creates new LZMA2 options and sets them to the given preset.
+     *
+     * @throws      UnsupportedOptionsException
+     *                          <code>preset</code> is not supported
+     */
+    public LZMA2Options(int preset) throws UnsupportedOptionsException {
+        setPreset(preset);
+    }
+
+    /**
+     * Creates new LZMA2 options and sets them to the given custom values.
+     *
+     * @throws      UnsupportedOptionsException
+     *                          unsupported options were specified
+     */
+    public LZMA2Options(int dictSize, int lc, int lp, int pb, int mode,
+                        int niceLen, int mf, int depthLimit)
+            throws UnsupportedOptionsException {
+        setDictSize(dictSize);
+        setLcLp(lc, lp);
+        setPb(pb);
+        setMode(mode);
+        setNiceLen(niceLen);
+        setMatchFinder(mf);
+        setDepthLimit(depthLimit);
+    }
+
+    /**
+     * Sets the compression options to the given preset.
+     * <p>
+     * The presets 0-3 are fast presets with medium compression.
+     * The presets 4-6 are fairly slow presets with high compression.
+     * The default preset (<code>PRESET_DEFAULT</code>) is 6.
+     * <p>
+     * The presets 7-9 are like the preset 6 but use bigger dictionaries
+     * and have higher compressor and decompressor memory requirements.
+     * Unless the uncompressed size of the file exceeds 8 MiB,
+     * 16 MiB, or 32 MiB, it is waste of memory to use the
+     * presets 7, 8, or 9, respectively.
+     *
+     * @throws      UnsupportedOptionsException
+     *                          <code>preset</code> is not supported
+     */
+    public void setPreset(int preset) throws UnsupportedOptionsException {
+        if (preset < 0 || preset > 9)
+            throw new UnsupportedOptionsException(
+                    "Unsupported preset: " + preset);
+
+        lc = LC_DEFAULT;
+        lp = LP_DEFAULT;
+        pb = PB_DEFAULT;
+        dictSize = presetToDictSize[preset];
+
+        if (preset <= 3) {
+            mode = MODE_FAST;
+            mf = MF_HC4;
+            niceLen = preset <= 1 ? 128 : NICE_LEN_MAX;
+            depthLimit = presetToDepthLimit[preset];
+        } else {
+            mode = MODE_NORMAL;
+            mf = MF_BT4;
+            niceLen = (preset == 4) ? 16 : (preset == 5) ? 32 : 64;
+            depthLimit = 0;
+        }
+    }
+
+    /**
+     * Sets the dictionary size in bytes.
+     * <p>
+     * The dictionary (or history buffer) holds the most recently seen
+     * uncompressed data. Bigger dictionary usually means better compression.
+     * However, using a dictioanary bigger than the size of the uncompressed
+     * data is waste of memory.
+     * <p>
+     * Any value in the range [DICT_SIZE_MIN, DICT_SIZE_MAX] is valid,
+     * but sizes of 2^n and 2^n + 2^(n-1) bytes are somewhat
+     * recommended.
+     *
+     * @throws      UnsupportedOptionsException
+     *                          <code>dictSize</code> is not supported
+     */
+    public void setDictSize(int dictSize) throws UnsupportedOptionsException {
+        if (dictSize < DICT_SIZE_MIN)
+            throw new UnsupportedOptionsException(
+                    "LZMA2 dictionary size must be at least 4 KiB: "
+                    + dictSize + " B");
+
+        if (dictSize > DICT_SIZE_MAX)
+            throw new UnsupportedOptionsException(
+                    "LZMA2 dictionary size must not exceed "
+                    + (DICT_SIZE_MAX >> 20) + " MiB: " + dictSize + " B");
+
+        this.dictSize = dictSize;
+    }
+
+    /**
+     * Gets the dictionary size in bytes.
+     */
+    public int getDictSize() {
+        return dictSize;
+    }
+
+    /**
+     * Sets a preset dictionary. Use null to disable the use of
+     * a preset dictionary. By default there is no preset dictionary.
+     * <p>
+     * <b>The .xz format doesn't support a preset dictionary for now.
+     * Do not set a preset dictionary unless you use raw LZMA2.</b>
+     * <p>
+     * Preset dictionary can be useful when compressing many similar,
+     * relatively small chunks of data independently from each other.
+     * A preset dictionary should contain typical strings that occur in
+     * the files being compressed. The most probable strings should be
+     * near the end of the preset dictionary. The preset dictionary used
+     * for compression is also needed for decompression.
+     */
+    public void setPresetDict(byte[] presetDict) {
+        this.presetDict = presetDict;
+    }
+
+    /**
+     * Gets the preset dictionary.
+     */
+    public byte[] getPresetDict() {
+        return presetDict;
+    }
+
+    /**
+     * Sets the number of literal context bits and literal position bits.
+     * <p>
+     * The sum of <code>lc</code> and <code>lp</code> is limited to 4.
+     * Trying to exceed it will throw an exception. This function lets
+     * you change both at the same time.
+     *
+     * @throws      UnsupportedOptionsException
+     *                          <code>lc</code> and <code>lp</code>
+     *                          are invalid
+     */
+    public void setLcLp(int lc, int lp) throws UnsupportedOptionsException {
+        if (lc < 0 || lp < 0 || lc > LC_LP_MAX || lp > LC_LP_MAX
+                || lc + lp > LC_LP_MAX)
+            throw new UnsupportedOptionsException(
+                    "lc + lp must not exceed " + LC_LP_MAX + ": "
+                    + lc + " + " + lp);
+
+        this.lc = lc;
+        this.lp = lp;
+    }
+
+    /**
+     * Sets the number of literal context bits.
+     * <p>
+     * All bytes that cannot be encoded as matches are encoded as literals.
+     * That is, literals are simply 8-bit bytes that are encoded one at
+     * a time.
+     * <p>
+     * The literal coding makes an assumption that the highest <code>lc</code>
+     * bits of the previous uncompressed byte correlate with the next byte.
+     * For example, in typical English text, an upper-case letter is often
+     * followed by a lower-case letter, and a lower-case letter is usually
+     * followed by another lower-case letter. In the US-ASCII character set,
+     * the highest three bits are 010 for upper-case letters and 011 for
+     * lower-case letters. When <code>lc</code> is at least 3, the literal
+     * coding can take advantage of this property in the  uncompressed data.
+     * <p>
+     * The default value (3) is usually good. If you want maximum compression,
+     * try <code>setLc(4)</code>. Sometimes it helps a little, and sometimes it
+     * makes compression worse. If it makes it worse, test for example
+     * <code>setLc(2)</code> too.
+     *
+     * @throws      UnsupportedOptionsException
+     *                          <code>lc</code> is invalid, or the sum
+     *                          of <code>lc</code> and <code>lp</code>
+     *                          exceed LC_LP_MAX
+     */
+    public void setLc(int lc) throws UnsupportedOptionsException {
+        setLcLp(lc, lp);
+    }
+
+    /**
+     * Sets the number of literal position bits.
+     * <p>
+     * This affets what kind of alignment in the uncompressed data is
+     * assumed when encoding literals. See {@link #setPb(int) setPb} for
+     * more information about alignment.
+     *
+     * @throws      UnsupportedOptionsException
+     *                          <code>lp</code> is invalid, or the sum
+     *                          of <code>lc</code> and <code>lp</code>
+     *                          exceed LC_LP_MAX
+     */
+    public void setLp(int lp) throws UnsupportedOptionsException {
+        setLcLp(lc, lp);
+    }
+
+    /**
+     * Gets the number of literal context bits.
+     */
+    public int getLc() {
+        return lc;
+    }
+
+    /**
+     * Gets the number of literal position bits.
+     */
+    public int getLp() {
+        return lp;
+    }
+
+    /**
+     * Sets the number of position bits.
+     * <p>
+     * This affects what kind of alignment in the uncompressed data is
+     * assumed in general. The default (2) means four-byte alignment
+     * (2^<code>pb</code> = 2^2 = 4), which is often a good choice when
+     * there's no better guess.
+     * <p>
+     * When the alignment is known, setting the number of position bits
+     * accordingly may reduce the file size a little. For example with text
+     * files having one-byte alignment (US-ASCII, ISO-8859-*, UTF-8), using
+     * <code>setPb(0)</code> can improve compression slightly. For UTF-16
+     * text, <code>setPb(1)</code> is a good choice. If the alignment is
+     * an odd number like 3 bytes, <code>setPb(0)</code> might be the best
+     * choice.
+     * <p>
+     * Even though the assumed alignment can be adjusted with
+     * <code>setPb</code> and <code>setLp</code>, LZMA2 still slightly favors
+     * 16-byte alignment. It might be worth taking into account when designing
+     * file formats that are likely to be often compressed with LZMA2.
+     *
+     * @throws      UnsupportedOptionsException
+     *                          <code>pb</code> is invalid
+     */
+    public void setPb(int pb) throws UnsupportedOptionsException {
+        if (pb < 0 || pb > PB_MAX)
+            throw new UnsupportedOptionsException(
+                    "pb must not exceed " + PB_MAX + ": " + pb);
+
+        this.pb = pb;
+    }
+
+    /**
+     * Gets the number of position bits.
+     */
+    public int getPb() {
+        return pb;
+    }
+
+    /**
+     * Sets the compression mode.
+     * <p>
+     * This specifies the method to analyze the data produced by
+     * a match finder. The default is <code>MODE_FAST</code> for presets
+     * 0-3 and <code>MODE_NORMAL</code> for presets 4-9.
+     * <p>
+     * Usually <code>MODE_FAST</code> is used with Hash Chain match finders
+     * and <code>MODE_NORMAL</code> with Binary Tree match finders. This is
+     * also what the presets do.
+     * <p>
+     * The special mode <code>MODE_UNCOMPRESSED</code> doesn't try to
+     * compress the data at all (and doesn't use a match finder) and will
+     * simply wrap it in uncompressed LZMA2 chunks.
+     *
+     * @throws      UnsupportedOptionsException
+     *                          <code>mode</code> is not supported
+     */
+    public void setMode(int mode) throws UnsupportedOptionsException {
+        if (mode < MODE_UNCOMPRESSED || mode > MODE_NORMAL)
+            throw new UnsupportedOptionsException(
+                    "Unsupported compression mode: " + mode);
+
+        this.mode = mode;
+    }
+
+    /**
+     * Gets the compression mode.
+     */
+    public int getMode() {
+        return mode;
+    }
+
+    /**
+     * Sets the nice length of matches.
+     * Once a match of at least <code>niceLen</code> bytes is found,
+     * the algorithm stops looking for better matches. Higher values tend
+     * to give better compression at the expense of speed. The default
+     * depends on the preset.
+     *
+     * @throws      UnsupportedOptionsException
+     *                          <code>niceLen</code> is invalid
+     */
+    public void setNiceLen(int niceLen) throws UnsupportedOptionsException {
+        if (niceLen < NICE_LEN_MIN)
+            throw new UnsupportedOptionsException(
+                    "Minimum nice length of matches is "
+                    + NICE_LEN_MIN + " bytes: " + niceLen);
+
+        if (niceLen > NICE_LEN_MAX)
+            throw new UnsupportedOptionsException(
+                    "Maximum nice length of matches is " + NICE_LEN_MAX
+                    + ": " + niceLen);
+
+        this.niceLen = niceLen;
+    }
+
+    /**
+     * Gets the nice length of matches.
+     */
+    public int getNiceLen() {
+        return niceLen;
+    }
+
+    /**
+     * Sets the match finder type.
+     * <p>
+     * Match finder has a major effect on compression speed, memory usage,
+     * and compression ratio. Usually Hash Chain match finders are faster
+     * than Binary Tree match finders. The default depends on the preset:
+     * 0-3 use <code>MF_HC4</code> and 4-9 use <code>MF_BT4</code>.
+     *
+     * @throws      UnsupportedOptionsException
+     *                          <code>mf</code> is not supported
+     */
+    public void setMatchFinder(int mf) throws UnsupportedOptionsException {
+        if (mf != MF_HC4 && mf != MF_BT4)
+            throw new UnsupportedOptionsException(
+                    "Unsupported match finder: " + mf);
+
+        this.mf = mf;
+    }
+
+    /**
+     * Gets the match finder type.
+     */
+    public int getMatchFinder() {
+        return mf;
+    }
+
+    /**
+     * Sets the match finder search depth limit.
+     * <p>
+     * The default is a special value of <code>0</code> which indicates that
+     * the depth limit should be automatically calculated by the selected
+     * match finder from the nice length of matches.
+     * <p>
+     * Reasonable depth limit for Hash Chain match finders is 4-100 and
+     * 16-1000 for Binary Tree match finders. Using very high values can
+     * make the compressor extremely slow with some files. Avoid settings
+     * higher than 1000 unless you are prepared to interrupt the compression
+     * in case it is taking far too long.
+     *
+     * @throws      UnsupportedOptionsException
+     *                          <code>depthLimit</code> is invalid
+     */
+    public void setDepthLimit(int depthLimit)
+            throws UnsupportedOptionsException {
+        if (depthLimit < 0)
+            throw new UnsupportedOptionsException(
+                    "Depth limit cannot be negative: " + depthLimit);
+
+        this.depthLimit = depthLimit;
+    }
+
+    /**
+     * Gets the match finder search depth limit.
+     */
+    public int getDepthLimit() {
+        return depthLimit;
+    }
+
+    public int getEncoderMemoryUsage() {
+        return (mode == MODE_UNCOMPRESSED)
+               ? UncompressedLZMA2OutputStream.getMemoryUsage()
+               : LZMA2OutputStream.getMemoryUsage(this);
+    }
+
+    public FinishableOutputStream getOutputStream(FinishableOutputStream out,
+                                                  ArrayCache arrayCache) {
+        if (mode == MODE_UNCOMPRESSED)
+            return new UncompressedLZMA2OutputStream(out, arrayCache);
+
+        return new LZMA2OutputStream(out, this, arrayCache);
+    }
+
+    /**
+     * Gets how much memory the LZMA2 decoder will need to decompress the data
+     * that was encoded with these options and stored in a .xz file.
+     * <p>
+     * The returned value may bigger than the value returned by a direct call
+     * to {@link LZMA2InputStream#getMemoryUsage(int)} if the dictionary size
+     * is not 2^n or 2^n + 2^(n-1) bytes. This is because the .xz
+     * headers store the dictionary size in such a format and other values
+     * are rounded up to the next such value. Such rounding is harmess except
+     * it might waste some memory if an unsual dictionary size is used.
+     * <p>
+     * If you use raw LZMA2 streams and unusual dictioanary size, call
+     * {@link LZMA2InputStream#getMemoryUsage} directly to get raw decoder
+     * memory requirements.
+     */
+    public int getDecoderMemoryUsage() {
+        // Round the dictionary size up to the next 2^n or 2^n + 2^(n-1).
+        int d = dictSize - 1;
+        d |= d >>> 2;
+        d |= d >>> 3;
+        d |= d >>> 4;
+        d |= d >>> 8;
+        d |= d >>> 16;
+        return LZMA2InputStream.getMemoryUsage(d + 1);
+    }
+
+    public InputStream getInputStream(InputStream in, ArrayCache arrayCache)
+            throws IOException {
+        return new LZMA2InputStream(in, dictSize, presetDict, arrayCache);
+    }
+
+    FilterEncoder getFilterEncoder() {
+        return new LZMA2Encoder(this);
+    }
+
+    public Object clone() {
+        try {
+            return super.clone();
+        } catch (CloneNotSupportedException e) {
+            assert false;
+            throw new RuntimeException();
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/LZMA2OutputStream.java b/src/org/tukaani/xz/LZMA2OutputStream.java
new file mode 100644
index 0000000..a82a1a5
--- /dev/null
+++ b/src/org/tukaani/xz/LZMA2OutputStream.java
@@ -0,0 +1,270 @@
+/*
+ * LZMA2OutputStream
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import org.tukaani.xz.lz.LZEncoder;
+import org.tukaani.xz.rangecoder.RangeEncoderToBuffer;
+import org.tukaani.xz.lzma.LZMAEncoder;
+
+class LZMA2OutputStream extends FinishableOutputStream {
+    static final int COMPRESSED_SIZE_MAX = 64 << 10;
+
+    private final ArrayCache arrayCache;
+
+    private FinishableOutputStream out;
+    private final DataOutputStream outData;
+
+    private LZEncoder lz;
+    private RangeEncoderToBuffer rc;
+    private LZMAEncoder lzma;
+
+    private final int props; // Cannot change props on the fly for now.
+    private boolean dictResetNeeded = true;
+    private boolean stateResetNeeded = true;
+    private boolean propsNeeded = true;
+
+    private int pendingSize = 0;
+    private boolean finished = false;
+    private IOException exception = null;
+
+    private final byte[] tempBuf = new byte[1];
+
+    private static int getExtraSizeBefore(int dictSize) {
+        return COMPRESSED_SIZE_MAX > dictSize
+               ? COMPRESSED_SIZE_MAX - dictSize : 0;
+    }
+
+    static int getMemoryUsage(LZMA2Options options) {
+        // 64 KiB buffer for the range encoder + a little extra + LZMAEncoder
+        int dictSize = options.getDictSize();
+        int extraSizeBefore = getExtraSizeBefore(dictSize);
+        return 70 + LZMAEncoder.getMemoryUsage(options.getMode(),
+                                               dictSize, extraSizeBefore,
+                                               options.getMatchFinder());
+    }
+
+    LZMA2OutputStream(FinishableOutputStream out, LZMA2Options options,
+                      ArrayCache arrayCache) {
+        if (out == null)
+            throw new NullPointerException();
+
+        this.arrayCache = arrayCache;
+        this.out = out;
+        outData = new DataOutputStream(out);
+        rc = new RangeEncoderToBuffer(COMPRESSED_SIZE_MAX, arrayCache);
+
+        int dictSize = options.getDictSize();
+        int extraSizeBefore = getExtraSizeBefore(dictSize);
+        lzma = LZMAEncoder.getInstance(rc,
+                options.getLc(), options.getLp(), options.getPb(),
+                options.getMode(),
+                dictSize, extraSizeBefore, options.getNiceLen(),
+                options.getMatchFinder(), options.getDepthLimit(),
+                this.arrayCache);
+
+        lz = lzma.getLZEncoder();
+
+        byte[] presetDict = options.getPresetDict();
+        if (presetDict != null && presetDict.length > 0) {
+            lz.setPresetDict(dictSize, presetDict);
+            dictResetNeeded = false;
+        }
+
+        props = (options.getPb() * 5 + options.getLp()) * 9 + options.getLc();
+    }
+
+    public void write(int b) throws IOException {
+        tempBuf[0] = (byte)b;
+        write(tempBuf, 0, 1);
+    }
+
+    public void write(byte[] buf, int off, int len) throws IOException {
+        if (off < 0 || len < 0 || off + len < 0 || off + len > buf.length)
+            throw new IndexOutOfBoundsException();
+
+        if (exception != null)
+            throw exception;
+
+        if (finished)
+            throw new XZIOException("Stream finished or closed");
+
+        try {
+            while (len > 0) {
+                int used = lz.fillWindow(buf, off, len);
+                off += used;
+                len -= used;
+                pendingSize += used;
+
+                if (lzma.encodeForLZMA2())
+                    writeChunk();
+            }
+        } catch (IOException e) {
+            exception = e;
+            throw e;
+        }
+    }
+
+    private void writeChunk() throws IOException {
+        int compressedSize = rc.finish();
+        int uncompressedSize = lzma.getUncompressedSize();
+
+        assert compressedSize > 0 : compressedSize;
+        assert uncompressedSize > 0 : uncompressedSize;
+
+        // +2 because the header of a compressed chunk is 2 bytes
+        // bigger than the header of an uncompressed chunk.
+        if (compressedSize + 2 < uncompressedSize) {
+            writeLZMA(uncompressedSize, compressedSize);
+        } else {
+            lzma.reset();
+            uncompressedSize = lzma.getUncompressedSize();
+            assert uncompressedSize > 0 : uncompressedSize;
+            writeUncompressed(uncompressedSize);
+        }
+
+        pendingSize -= uncompressedSize;
+        lzma.resetUncompressedSize();
+        rc.reset();
+    }
+
+    private void writeLZMA(int uncompressedSize, int compressedSize)
+            throws IOException {
+        int control;
+
+        if (propsNeeded) {
+            if (dictResetNeeded)
+                control = 0x80 + (3 << 5);
+            else
+                control = 0x80 + (2 << 5);
+        } else {
+            if (stateResetNeeded)
+                control = 0x80 + (1 << 5);
+            else
+                control = 0x80;
+        }
+
+        control |= (uncompressedSize - 1) >>> 16;
+        outData.writeByte(control);
+
+        outData.writeShort(uncompressedSize - 1);
+        outData.writeShort(compressedSize - 1);
+
+        if (propsNeeded)
+            outData.writeByte(props);
+
+        rc.write(out);
+
+        propsNeeded = false;
+        stateResetNeeded = false;
+        dictResetNeeded = false;
+    }
+
+    private void writeUncompressed(int uncompressedSize) throws IOException {
+        while (uncompressedSize > 0) {
+            int chunkSize = Math.min(uncompressedSize, COMPRESSED_SIZE_MAX);
+            outData.writeByte(dictResetNeeded ? 0x01 : 0x02);
+            outData.writeShort(chunkSize - 1);
+            lz.copyUncompressed(out, uncompressedSize, chunkSize);
+            uncompressedSize -= chunkSize;
+            dictResetNeeded = false;
+        }
+
+        stateResetNeeded = true;
+    }
+
+    private void writeEndMarker() throws IOException {
+        assert !finished;
+
+        if (exception != null)
+            throw exception;
+
+        lz.setFinishing();
+
+        try {
+            while (pendingSize > 0) {
+                lzma.encodeForLZMA2();
+                writeChunk();
+            }
+
+            out.write(0x00);
+        } catch (IOException e) {
+            exception = e;
+            throw e;
+        }
+
+        finished = true;
+
+        lzma.putArraysToCache(arrayCache);
+        lzma = null;
+        lz = null;
+        rc.putArraysToCache(arrayCache);
+        rc = null;
+    }
+
+    public void flush() throws IOException {
+        if (exception != null)
+            throw exception;
+
+        if (finished)
+            throw new XZIOException("Stream finished or closed");
+
+        try {
+            lz.setFlushing();
+
+            while (pendingSize > 0) {
+                lzma.encodeForLZMA2();
+                writeChunk();
+            }
+
+            out.flush();
+        } catch (IOException e) {
+            exception = e;
+            throw e;
+        }
+    }
+
+    public void finish() throws IOException {
+        if (!finished) {
+            writeEndMarker();
+
+            try {
+                out.finish();
+            } catch (IOException e) {
+                exception = e;
+                throw e;
+            }
+        }
+    }
+
+    public void close() throws IOException {
+        if (out != null) {
+            if (!finished) {
+                try {
+                    writeEndMarker();
+                } catch (IOException e) {}
+            }
+
+            try {
+                out.close();
+            } catch (IOException e) {
+                if (exception == null)
+                    exception = e;
+            }
+
+            out = null;
+        }
+
+        if (exception != null)
+            throw exception;
+    }
+}
diff --git a/src/org/tukaani/xz/MemoryLimitException.java b/src/org/tukaani/xz/MemoryLimitException.java
new file mode 100644
index 0000000..9d766bd
--- /dev/null
+++ b/src/org/tukaani/xz/MemoryLimitException.java
@@ -0,0 +1,60 @@
+/*
+ * MemoryLimitException
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+/**
+ * Thrown when the memory usage limit given to the XZ decompressor
+ * would be exceeded.
+ * <p>
+ * The amount of memory required and the memory usage limit are
+ * included in the error detail message in human readable format.
+ */
+public class MemoryLimitException extends XZIOException {
+    private static final long serialVersionUID = 3L;
+
+    private final int memoryNeeded;
+    private final int memoryLimit;
+
+    /**
+     * Creates a new MemoryLimitException.
+     * <p>
+     * The amount of memory needed and the memory usage limit are
+     * included in the error detail message.
+     *
+     * @param   memoryNeeded    amount of memory needed as kibibytes (KiB)
+     * @param   memoryLimit     specified memory usage limit as kibibytes (KiB)
+     */
+    public MemoryLimitException(int memoryNeeded, int memoryLimit) {
+        super("" + memoryNeeded + " KiB of memory would be needed; limit was "
+              + memoryLimit + " KiB");
+
+        this.memoryNeeded = memoryNeeded;
+        this.memoryLimit = memoryLimit;
+    }
+
+    /**
+     * Gets how much memory is required to decompress the data.
+     *
+     * @return      amount of memory needed as kibibytes (KiB)
+     */
+    public int getMemoryNeeded() {
+        return memoryNeeded;
+    }
+
+    /**
+     * Gets what the memory usage limit was at the time the exception
+     * was created.
+     *
+     * @return      memory usage limit as kibibytes (KiB)
+     */
+    public int getMemoryLimit() {
+        return memoryLimit;
+    }
+}
diff --git a/src/org/tukaani/xz/RawCoder.java b/src/org/tukaani/xz/RawCoder.java
new file mode 100644
index 0000000..12c7da8
--- /dev/null
+++ b/src/org/tukaani/xz/RawCoder.java
@@ -0,0 +1,33 @@
+/*
+ * RawCoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+class RawCoder {
+    static void validate(FilterCoder[] filters)
+            throws UnsupportedOptionsException {
+        for (int i = 0; i < filters.length - 1; ++i)
+            if (!filters[i].nonLastOK())
+                throw new UnsupportedOptionsException(
+                        "Unsupported XZ filter chain");
+
+        if (!filters[filters.length - 1].lastOK())
+            throw new UnsupportedOptionsException(
+                    "Unsupported XZ filter chain");
+
+        int changesSizeCount = 0;
+        for (int i = 0; i < filters.length; ++i)
+            if (filters[i].changesSize())
+                ++changesSizeCount;
+
+        if (changesSizeCount > 3)
+            throw new UnsupportedOptionsException(
+                    "Unsupported XZ filter chain");
+    }
+}
diff --git a/src/org/tukaani/xz/SeekableInputStream.java b/src/org/tukaani/xz/SeekableInputStream.java
new file mode 100644
index 0000000..a2f908a
--- /dev/null
+++ b/src/org/tukaani/xz/SeekableInputStream.java
@@ -0,0 +1,81 @@
+/*
+ * SeekableInputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+/**
+ * Input stream with random access support.
+ */
+public abstract class SeekableInputStream extends InputStream {
+    /**
+     * Seeks <code>n</code> bytes forward in this stream.
+     * <p>
+     * This will not seek past the end of the file. If the current position
+     * is already at or past the end of the file, this doesn't seek at all
+     * and returns <code>0</code>. Otherwise, if skipping <code>n</code> bytes
+     * would cause the position to exceed the stream size, this will do
+     * equivalent of <code>seek(length())</code> and the return value will
+     * be adjusted accordingly.
+     * <p>
+     * If <code>n</code> is negative, the position isn't changed and
+     * the return value is <code>0</code>. It doesn't seek backward
+     * because it would conflict with the specification of
+     * {@link java.io.InputStream#skip(long) InputStream.skip}.
+     *
+     * @return      <code>0</code> if <code>n</code> is negative,
+     *              less than <code>n</code> if skipping <code>n</code>
+     *              bytes would seek past the end of the file,
+     *              <code>n</code> otherwise
+     *
+     * @throws      IOException might be thrown by {@link #seek(long)}
+     */
+    public long skip(long n) throws IOException {
+        if (n <= 0)
+            return 0;
+
+        long size = length();
+        long pos = position();
+        if (pos >= size)
+            return 0;
+
+        if (size - pos < n)
+            n = size - pos;
+
+        seek(pos + n);
+        return n;
+    }
+
+    /**
+     * Gets the size of the stream.
+     */
+    public abstract long length() throws IOException;
+
+    /**
+     * Gets the current position in the stream.
+     */
+    public abstract long position() throws IOException;
+
+    /**
+     * Seeks to the specified absolute position in the stream.
+     * <p>
+     * Seeking past the end of the file should be supported by the subclasses
+     * unless there is a good reason to do otherwise. If one has seeked
+     * past the end of the stream, <code>read</code> will return
+     * <code>-1</code> to indicate end of stream.
+     *
+     * @param       pos         new read position in the stream
+     *
+     * @throws      IOException if <code>pos</code> is negative or if
+     *                          a stream-specific I/O error occurs
+     */
+    public abstract void seek(long pos) throws IOException;
+}
diff --git a/src/org/tukaani/xz/SimpleInputStream.java b/src/org/tukaani/xz/SimpleInputStream.java
new file mode 100644
index 0000000..afd40c7
--- /dev/null
+++ b/src/org/tukaani/xz/SimpleInputStream.java
@@ -0,0 +1,138 @@
+/*
+ * SimpleInputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+import java.io.IOException;
+import org.tukaani.xz.simple.SimpleFilter;
+
+class SimpleInputStream extends InputStream {
+    private static final int FILTER_BUF_SIZE = 4096;
+
+    private InputStream in;
+    private final SimpleFilter simpleFilter;
+
+    private final byte[] filterBuf = new byte[FILTER_BUF_SIZE];
+    private int pos = 0;
+    private int filtered = 0;
+    private int unfiltered = 0;
+
+    private boolean endReached = false;
+    private IOException exception = null;
+
+    private final byte[] tempBuf = new byte[1];
+
+    static int getMemoryUsage() {
+        return 1 + FILTER_BUF_SIZE / 1024;
+    }
+
+    SimpleInputStream(InputStream in, SimpleFilter simpleFilter) {
+        // Check for null because otherwise null isn't detect
+        // in this constructor.
+        if (in == null)
+            throw new NullPointerException();
+
+        // The simpleFilter argument comes from this package
+        // so it is known to be non-null already.
+        assert simpleFilter != null;
+
+        this.in = in;
+        this.simpleFilter = simpleFilter;
+    }
+
+    public int read() throws IOException {
+        return read(tempBuf, 0, 1) == -1 ? -1 : (tempBuf[0] & 0xFF);
+    }
+
+    public int read(byte[] buf, int off, int len) throws IOException {
+        if (off < 0 || len < 0 || off + len < 0 || off + len > buf.length)
+            throw new IndexOutOfBoundsException();
+
+        if (len == 0)
+            return 0;
+
+        if (in == null)
+            throw new XZIOException("Stream closed");
+
+        if (exception != null)
+            throw exception;
+
+        try {
+            int size = 0;
+
+            while (true) {
+                // Copy filtered data into the caller-provided buffer.
+                int copySize = Math.min(filtered, len);
+                System.arraycopy(filterBuf, pos, buf, off, copySize);
+                pos += copySize;
+                filtered -= copySize;
+                off += copySize;
+                len -= copySize;
+                size += copySize;
+
+                // If end of filterBuf was reached, move the pending data to
+                // the beginning of the buffer so that more data can be
+                // copied into filterBuf on the next loop iteration.
+                if (pos + filtered + unfiltered == FILTER_BUF_SIZE) {
+                    System.arraycopy(filterBuf, pos, filterBuf, 0,
+                                     filtered + unfiltered);
+                    pos = 0;
+                }
+
+                if (len == 0 || endReached)
+                    return size > 0 ? size : -1;
+
+                assert filtered == 0;
+
+                // Get more data into the temporary buffer.
+                int inSize = FILTER_BUF_SIZE - (pos + filtered + unfiltered);
+                inSize = in.read(filterBuf, pos + filtered + unfiltered,
+                                 inSize);
+
+                if (inSize == -1) {
+                    // Mark the remaining unfiltered bytes to be ready
+                    // to be copied out.
+                    endReached = true;
+                    filtered = unfiltered;
+                    unfiltered = 0;
+                } else {
+                    // Filter the data in filterBuf.
+                    unfiltered += inSize;
+                    filtered = simpleFilter.code(filterBuf, pos, unfiltered);
+                    assert filtered <= unfiltered;
+                    unfiltered -= filtered;
+                }
+            }
+        } catch (IOException e) {
+            exception = e;
+            throw e;
+        }
+    }
+
+    public int available() throws IOException {
+        if (in == null)
+            throw new XZIOException("Stream closed");
+
+        if (exception != null)
+            throw exception;
+
+        return filtered;
+    }
+
+    public void close() throws IOException {
+        if (in != null) {
+            try {
+                in.close();
+            } finally {
+                in = null;
+            }
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/SingleXZInputStream.java b/src/org/tukaani/xz/SingleXZInputStream.java
new file mode 100644
index 0000000..8da2be0
--- /dev/null
+++ b/src/org/tukaani/xz/SingleXZInputStream.java
@@ -0,0 +1,535 @@
+/*
+ * SingleXZInputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.EOFException;
+import org.tukaani.xz.common.DecoderUtil;
+import org.tukaani.xz.common.StreamFlags;
+import org.tukaani.xz.index.IndexHash;
+import org.tukaani.xz.check.Check;
+
+/**
+ * Decompresses exactly one XZ Stream in streamed mode (no seeking).
+ * The decompression stops after the first XZ Stream has been decompressed,
+ * and the read position in the input stream is left at the first byte
+ * after the end of the XZ Stream. This can be useful when XZ data has
+ * been stored inside some other file format or protocol.
+ * <p>
+ * Unless you know what you are doing, don't use this class to decompress
+ * standalone .xz files. For that purpose, use <code>XZInputStream</code>.
+ *
+ * <h4>When uncompressed size is known beforehand</h4>
+ * <p>
+ * If you are decompressing complete XZ streams and your application knows
+ * exactly how much uncompressed data there should be, it is good to try
+ * reading one more byte by calling <code>read()</code> and checking
+ * that it returns <code>-1</code>. This way the decompressor will parse the
+ * file footers and verify the integrity checks, giving the caller more
+ * confidence that the uncompressed data is valid.
+ *
+ * @see XZInputStream
+ */
+public class SingleXZInputStream extends InputStream {
+    private InputStream in;
+    private final ArrayCache arrayCache;
+    private final int memoryLimit;
+    private final StreamFlags streamHeaderFlags;
+    private final Check check;
+    private final boolean verifyCheck;
+    private BlockInputStream blockDecoder = null;
+    private final IndexHash indexHash = new IndexHash();
+    private boolean endReached = false;
+    private IOException exception = null;
+
+    private final byte[] tempBuf = new byte[1];
+
+    /**
+     * Reads the Stream Header into a buffer.
+     * This is a helper function for the constructors.
+     */
+    private static byte[] readStreamHeader(InputStream in) throws IOException {
+        byte[] streamHeader = new byte[DecoderUtil.STREAM_HEADER_SIZE];
+        new DataInputStream(in).readFully(streamHeader);
+        return streamHeader;
+    }
+
+    /**
+     * Creates a new XZ decompressor that decompresses exactly one
+     * XZ Stream from <code>in</code> without a memory usage limit.
+     * <p>
+     * This constructor reads and parses the XZ Stream Header (12 bytes)
+     * from <code>in</code>. The header of the first Block is not read
+     * until <code>read</code> is called.
+     *
+     * @param       in          input stream from which XZ-compressed
+     *                          data is read
+     *
+     * @throws      XZFormatException
+     *                          input is not in the XZ format
+     *
+     * @throws      CorruptedInputException
+     *                          XZ header CRC32 doesn't match
+     *
+     * @throws      UnsupportedOptionsException
+     *                          XZ header is valid but specifies options
+     *                          not supported by this implementation
+     *
+     * @throws      EOFException
+     *                          less than 12 bytes of input was available
+     *                          from <code>in</code>
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     */
+    public SingleXZInputStream(InputStream in) throws IOException {
+        this(in, -1);
+    }
+
+    /**
+     * Creates a new XZ decompressor that decompresses exactly one
+     * XZ Stream from <code>in</code> without a memory usage limit.
+     * <p>
+     * This is identical to <code>SingleXZInputStream(InputStream)</code>
+     * except that this also takes the <code>arrayCache</code> argument.
+     *
+     * @param       in          input stream from which XZ-compressed
+     *                          data is read
+     *
+     * @param       arrayCache  cache to be used for allocating large arrays
+     *
+     * @throws      XZFormatException
+     *                          input is not in the XZ format
+     *
+     * @throws      CorruptedInputException
+     *                          XZ header CRC32 doesn't match
+     *
+     * @throws      UnsupportedOptionsException
+     *                          XZ header is valid but specifies options
+     *                          not supported by this implementation
+     *
+     * @throws      EOFException
+     *                          less than 12 bytes of input was available
+     *                          from <code>in</code>
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     *
+     * @since 1.7
+     */
+    public SingleXZInputStream(InputStream in, ArrayCache arrayCache)
+            throws IOException {
+        this(in, -1, arrayCache);
+    }
+
+    /**
+     * Creates a new XZ decompressor that decompresses exactly one
+     * XZ Stream from <code>in</code> with an optional memory usage limit.
+     * <p>
+     * This is identical to <code>SingleXZInputStream(InputStream)</code>
+     * except that this also takes the <code>memoryLimit</code> argument.
+     *
+     * @param       in          input stream from which XZ-compressed
+     *                          data is read
+     *
+     * @param       memoryLimit memory usage limit in kibibytes (KiB)
+     *                          or <code>-1</code> to impose no
+     *                          memory usage limit
+     *
+     * @throws      XZFormatException
+     *                          input is not in the XZ format
+     *
+     * @throws      CorruptedInputException
+     *                          XZ header CRC32 doesn't match
+     *
+     * @throws      UnsupportedOptionsException
+     *                          XZ header is valid but specifies options
+     *                          not supported by this implementation
+     *
+     * @throws      EOFException
+     *                          less than 12 bytes of input was available
+     *                          from <code>in</code>
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     */
+    public SingleXZInputStream(InputStream in, int memoryLimit)
+            throws IOException {
+        this(in, memoryLimit, true);
+    }
+
+    /**
+     * Creates a new XZ decompressor that decompresses exactly one
+     * XZ Stream from <code>in</code> with an optional memory usage limit.
+     * <p>
+     * This is identical to <code>SingleXZInputStream(InputStream)</code>
+     * except that this also takes the <code>memoryLimit</code> and
+     * <code>arrayCache</code> arguments.
+     *
+     * @param       in          input stream from which XZ-compressed
+     *                          data is read
+     *
+     * @param       memoryLimit memory usage limit in kibibytes (KiB)
+     *                          or <code>-1</code> to impose no
+     *                          memory usage limit
+     *
+     * @param       arrayCache  cache to be used for allocating large arrays
+     *
+     * @throws      XZFormatException
+     *                          input is not in the XZ format
+     *
+     * @throws      CorruptedInputException
+     *                          XZ header CRC32 doesn't match
+     *
+     * @throws      UnsupportedOptionsException
+     *                          XZ header is valid but specifies options
+     *                          not supported by this implementation
+     *
+     * @throws      EOFException
+     *                          less than 12 bytes of input was available
+     *                          from <code>in</code>
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     *
+     * @since 1.7
+     */
+    public SingleXZInputStream(InputStream in, int memoryLimit,
+                               ArrayCache arrayCache) throws IOException {
+        this(in, memoryLimit, true, arrayCache);
+    }
+
+    /**
+     * Creates a new XZ decompressor that decompresses exactly one
+     * XZ Stream from <code>in</code> with an optional memory usage limit
+     * and ability to disable verification of integrity checks.
+     * <p>
+     * This is identical to <code>SingleXZInputStream(InputStream,int)</code>
+     * except that this also takes the <code>verifyCheck</code> argument.
+     * <p>
+     * Note that integrity check verification should almost never be disabled.
+     * Possible reasons to disable integrity check verification:
+     * <ul>
+     *   <li>Trying to recover data from a corrupt .xz file.</li>
+     *   <li>Speeding up decompression. This matters mostly with SHA-256
+     *   or with files that have compressed extremely well. It's recommended
+     *   that integrity checking isn't disabled for performance reasons
+     *   unless the file integrity is verified externally in some other
+     *   way.</li>
+     * </ul>
+     * <p>
+     * <code>verifyCheck</code> only affects the integrity check of
+     * the actual compressed data. The CRC32 fields in the headers
+     * are always verified.
+     *
+     * @param       in          input stream from which XZ-compressed
+     *                          data is read
+     *
+     * @param       memoryLimit memory usage limit in kibibytes (KiB)
+     *                          or <code>-1</code> to impose no
+     *                          memory usage limit
+     *
+     * @param       verifyCheck if <code>true</code>, the integrity checks
+     *                          will be verified; this should almost never
+     *                          be set to <code>false</code>
+     *
+     * @throws      XZFormatException
+     *                          input is not in the XZ format
+     *
+     * @throws      CorruptedInputException
+     *                          XZ header CRC32 doesn't match
+     *
+     * @throws      UnsupportedOptionsException
+     *                          XZ header is valid but specifies options
+     *                          not supported by this implementation
+     *
+     * @throws      EOFException
+     *                          less than 12 bytes of input was available
+     *                          from <code>in</code>
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     *
+     * @since 1.6
+     */
+    public SingleXZInputStream(InputStream in, int memoryLimit,
+                               boolean verifyCheck) throws IOException {
+        this(in, memoryLimit, verifyCheck, ArrayCache.getDefaultCache());
+    }
+
+    /**
+     * Creates a new XZ decompressor that decompresses exactly one
+     * XZ Stream from <code>in</code> with an optional memory usage limit
+     * and ability to disable verification of integrity checks.
+     * <p>
+     * This is identical to
+     * <code>SingleXZInputStream(InputStream,int,boolean)</code>
+     * except that this also takes the <code>arrayCache</code> argument.
+     *
+     * @param       in          input stream from which XZ-compressed
+     *                          data is read
+     *
+     * @param       memoryLimit memory usage limit in kibibytes (KiB)
+     *                          or <code>-1</code> to impose no
+     *                          memory usage limit
+     *
+     * @param       verifyCheck if <code>true</code>, the integrity checks
+     *                          will be verified; this should almost never
+     *                          be set to <code>false</code>
+     *
+     * @param       arrayCache  cache to be used for allocating large arrays
+     *
+     * @throws      XZFormatException
+     *                          input is not in the XZ format
+     *
+     * @throws      CorruptedInputException
+     *                          XZ header CRC32 doesn't match
+     *
+     * @throws      UnsupportedOptionsException
+     *                          XZ header is valid but specifies options
+     *                          not supported by this implementation
+     *
+     * @throws      EOFException
+     *                          less than 12 bytes of input was available
+     *                          from <code>in</code>
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     *
+     * @since 1.7
+     */
+    public SingleXZInputStream(InputStream in, int memoryLimit,
+                               boolean verifyCheck, ArrayCache arrayCache)
+            throws IOException {
+        this(in, memoryLimit, verifyCheck, readStreamHeader(in), arrayCache);
+    }
+
+    SingleXZInputStream(InputStream in, int memoryLimit, boolean verifyCheck,
+                        byte[] streamHeader, ArrayCache arrayCache)
+            throws IOException {
+        this.arrayCache = arrayCache;
+        this.in = in;
+        this.memoryLimit = memoryLimit;
+        this.verifyCheck = verifyCheck;
+        streamHeaderFlags = DecoderUtil.decodeStreamHeader(streamHeader);
+        check = Check.getInstance(streamHeaderFlags.checkType);
+    }
+
+    /**
+     * Gets the ID of the integrity check used in this XZ Stream.
+     *
+     * @return      the Check ID specified in the XZ Stream Header
+     */
+    public int getCheckType() {
+        return streamHeaderFlags.checkType;
+    }
+
+    /**
+     * Gets the name of the integrity check used in this XZ Stream.
+     *
+     * @return      the name of the check specified in the XZ Stream Header
+     */
+    public String getCheckName() {
+        return check.getName();
+    }
+
+    /**
+     * Decompresses the next byte from this input stream.
+     * <p>
+     * Reading lots of data with <code>read()</code> from this input stream
+     * may be inefficient. Wrap it in {@link java.io.BufferedInputStream}
+     * if you need to read lots of data one byte at a time.
+     *
+     * @return      the next decompressed byte, or <code>-1</code>
+     *              to indicate the end of the compressed stream
+     *
+     * @throws      CorruptedInputException
+     * @throws      UnsupportedOptionsException
+     * @throws      MemoryLimitException
+     *
+     * @throws      XZIOException if the stream has been closed
+     *
+     * @throws      EOFException
+     *                          compressed input is truncated or corrupt
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     */
+    public int read() throws IOException {
+        return read(tempBuf, 0, 1) == -1 ? -1 : (tempBuf[0] & 0xFF);
+    }
+
+    /**
+     * Decompresses into an array of bytes.
+     * <p>
+     * If <code>len</code> is zero, no bytes are read and <code>0</code>
+     * is returned. Otherwise this will try to decompress <code>len</code>
+     * bytes of uncompressed data. Less than <code>len</code> bytes may
+     * be read only in the following situations:
+     * <ul>
+     *   <li>The end of the compressed data was reached successfully.</li>
+     *   <li>An error is detected after at least one but less <code>len</code>
+     *       bytes have already been successfully decompressed.
+     *       The next call with non-zero <code>len</code> will immediately
+     *       throw the pending exception.</li>
+     *   <li>An exception is thrown.</li>
+     * </ul>
+     *
+     * @param       buf         target buffer for uncompressed data
+     * @param       off         start offset in <code>buf</code>
+     * @param       len         maximum number of uncompressed bytes to read
+     *
+     * @return      number of bytes read, or <code>-1</code> to indicate
+     *              the end of the compressed stream
+     *
+     * @throws      CorruptedInputException
+     * @throws      UnsupportedOptionsException
+     * @throws      MemoryLimitException
+     *
+     * @throws      XZIOException if the stream has been closed
+     *
+     * @throws      EOFException
+     *                          compressed input is truncated or corrupt
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     */
+    public int read(byte[] buf, int off, int len) throws IOException {
+        if (off < 0 || len < 0 || off + len < 0 || off + len > buf.length)
+            throw new IndexOutOfBoundsException();
+
+        if (len == 0)
+            return 0;
+
+        if (in == null)
+            throw new XZIOException("Stream closed");
+
+        if (exception != null)
+            throw exception;
+
+        if (endReached)
+            return -1;
+
+        int size = 0;
+
+        try {
+            while (len > 0) {
+                if (blockDecoder == null) {
+                    try {
+                        blockDecoder = new BlockInputStream(
+                                in, check, verifyCheck, memoryLimit, -1, -1,
+                                arrayCache);
+                    } catch (IndexIndicatorException e) {
+                        indexHash.validate(in);
+                        validateStreamFooter();
+                        endReached = true;
+                        return size > 0 ? size : -1;
+                    }
+                }
+
+                int ret = blockDecoder.read(buf, off, len);
+
+                if (ret > 0) {
+                    size += ret;
+                    off += ret;
+                    len -= ret;
+                } else if (ret == -1) {
+                    indexHash.add(blockDecoder.getUnpaddedSize(),
+                                  blockDecoder.getUncompressedSize());
+                    blockDecoder = null;
+                }
+            }
+        } catch (IOException e) {
+            exception = e;
+            if (size == 0)
+                throw e;
+        }
+
+        return size;
+    }
+
+    private void validateStreamFooter() throws IOException {
+        byte[] buf = new byte[DecoderUtil.STREAM_HEADER_SIZE];
+        new DataInputStream(in).readFully(buf);
+        StreamFlags streamFooterFlags = DecoderUtil.decodeStreamFooter(buf);
+
+        if (!DecoderUtil.areStreamFlagsEqual(streamHeaderFlags,
+                                             streamFooterFlags)
+                || indexHash.getIndexSize() != streamFooterFlags.backwardSize)
+            throw new CorruptedInputException(
+                    "XZ Stream Footer does not match Stream Header");
+    }
+
+    /**
+     * Returns the number of uncompressed bytes that can be read
+     * without blocking. The value is returned with an assumption
+     * that the compressed input data will be valid. If the compressed
+     * data is corrupt, <code>CorruptedInputException</code> may get
+     * thrown before the number of bytes claimed to be available have
+     * been read from this input stream.
+     *
+     * @return      the number of uncompressed bytes that can be read
+     *              without blocking
+     */
+    public int available() throws IOException {
+        if (in == null)
+            throw new XZIOException("Stream closed");
+
+        if (exception != null)
+            throw exception;
+
+        return blockDecoder == null ? 0 : blockDecoder.available();
+    }
+
+    /**
+     * Closes the stream and calls <code>in.close()</code>.
+     * If the stream was already closed, this does nothing.
+     * <p>
+     * This is equivalent to <code>close(true)</code>.
+     *
+     * @throws  IOException if thrown by <code>in.close()</code>
+     */
+    public void close() throws IOException {
+        close(true);
+    }
+
+    /**
+     * Closes the stream and optionally calls <code>in.close()</code>.
+     * If the stream was already closed, this does nothing.
+     * If <code>close(false)</code> has been called, a further
+     * call of <code>close(true)</code> does nothing (it doesn't call
+     * <code>in.close()</code>).
+     * <p>
+     * If you don't want to close the underlying <code>InputStream</code>,
+     * there is usually no need to worry about closing this stream either;
+     * it's fine to do nothing and let the garbage collector handle it.
+     * However, if you are using {@link ArrayCache}, <code>close(false)</code>
+     * can be useful to put the allocated arrays back to the cache without
+     * closing the underlying <code>InputStream</code>.
+     * <p>
+     * Note that if you successfully reach the end of the stream
+     * (<code>read</code> returns <code>-1</code>), the arrays are
+     * automatically put back to the cache by that <code>read</code> call. In
+     * this situation <code>close(false)</code> is redundant (but harmless).
+     *
+     * @throws  IOException if thrown by <code>in.close()</code>
+     *
+     * @since 1.7
+     */
+    public void close(boolean closeInput) throws IOException {
+        if (in != null) {
+            if (blockDecoder != null) {
+                blockDecoder.close();
+                blockDecoder = null;
+            }
+
+            try {
+                if (closeInput)
+                    in.close();
+            } finally {
+                in = null;
+            }
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/UncompressedLZMA2OutputStream.java b/src/org/tukaani/xz/UncompressedLZMA2OutputStream.java
new file mode 100644
index 0000000..5d0e65f
--- /dev/null
+++ b/src/org/tukaani/xz/UncompressedLZMA2OutputStream.java
@@ -0,0 +1,164 @@
+/*
+ * UncompressedLZMA2OutputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+class UncompressedLZMA2OutputStream extends FinishableOutputStream {
+    private final ArrayCache arrayCache;
+
+    private FinishableOutputStream out;
+    private final DataOutputStream outData;
+
+    private final byte[] uncompBuf;
+    private int uncompPos = 0;
+    private boolean dictResetNeeded = true;
+
+    private boolean finished = false;
+    private IOException exception = null;
+
+    private final byte[] tempBuf = new byte[1];
+
+    static int getMemoryUsage() {
+        // uncompBuf + a little extra
+        return 70;
+    }
+
+    UncompressedLZMA2OutputStream(FinishableOutputStream out,
+                                  ArrayCache arrayCache) {
+        if (out == null)
+            throw new NullPointerException();
+
+        this.out = out;
+        outData = new DataOutputStream(out);
+
+        // We only allocate one array from the cache. We will call
+        // putArray directly in writeEndMarker and thus we don't use
+        // ResettableArrayCache here.
+        this.arrayCache = arrayCache;
+        uncompBuf = arrayCache.getByteArray(
+                LZMA2OutputStream.COMPRESSED_SIZE_MAX, false);
+    }
+
+    public void write(int b) throws IOException {
+        tempBuf[0] = (byte)b;
+        write(tempBuf, 0, 1);
+    }
+
+    public void write(byte[] buf, int off, int len) throws IOException {
+        if (off < 0 || len < 0 || off + len < 0 || off + len > buf.length)
+            throw new IndexOutOfBoundsException();
+
+        if (exception != null)
+            throw exception;
+
+        if (finished)
+            throw new XZIOException("Stream finished or closed");
+
+        try {
+            while (len > 0) {
+                int copySize = Math.min(LZMA2OutputStream.COMPRESSED_SIZE_MAX
+                                        - uncompPos, len);
+                System.arraycopy(buf, off, uncompBuf, uncompPos, copySize);
+                len -= copySize;
+                uncompPos += copySize;
+
+                if (uncompPos == LZMA2OutputStream.COMPRESSED_SIZE_MAX)
+                    writeChunk();
+            }
+        } catch (IOException e) {
+            exception = e;
+            throw e;
+        }
+    }
+
+    private void writeChunk() throws IOException {
+        outData.writeByte(dictResetNeeded ? 0x01 : 0x02);
+        outData.writeShort(uncompPos - 1);
+        outData.write(uncompBuf, 0, uncompPos);
+        uncompPos = 0;
+        dictResetNeeded = false;
+    }
+
+    private void writeEndMarker() throws IOException {
+        if (exception != null)
+            throw exception;
+
+        if (finished)
+            throw new XZIOException("Stream finished or closed");
+
+        try {
+            if (uncompPos > 0)
+                writeChunk();
+
+            out.write(0x00);
+        } catch (IOException e) {
+            exception = e;
+            throw e;
+        }
+
+        finished = true;
+        arrayCache.putArray(uncompBuf);
+    }
+
+    public void flush() throws IOException {
+        if (exception != null)
+            throw exception;
+
+        if (finished)
+            throw new XZIOException("Stream finished or closed");
+
+        try {
+            if (uncompPos > 0)
+                writeChunk();
+
+            out.flush();
+        } catch (IOException e) {
+            exception = e;
+            throw e;
+        }
+    }
+
+    public void finish() throws IOException {
+        if (!finished) {
+            writeEndMarker();
+
+            try {
+                out.finish();
+            } catch (IOException e) {
+                exception = e;
+                throw e;
+            }
+        }
+    }
+
+    public void close() throws IOException {
+        if (out != null) {
+            if (!finished) {
+                try {
+                    writeEndMarker();
+                } catch (IOException e) {}
+            }
+
+            try {
+                out.close();
+            } catch (IOException e) {
+                if (exception == null)
+                    exception = e;
+            }
+
+            out = null;
+        }
+
+        if (exception != null)
+            throw exception;
+    }
+}
diff --git a/src/org/tukaani/xz/UnsupportedOptionsException.java b/src/org/tukaani/xz/UnsupportedOptionsException.java
new file mode 100644
index 0000000..9aa16e8
--- /dev/null
+++ b/src/org/tukaani/xz/UnsupportedOptionsException.java
@@ -0,0 +1,34 @@
+/*
+ * UnsupportedOptionsException
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+/**
+ * Thrown when compression options not supported by this implementation
+ * are detected. Some other implementation might support those options.
+ */
+public class UnsupportedOptionsException extends XZIOException {
+    private static final long serialVersionUID = 3L;
+
+    /**
+     * Creates a new UnsupportedOptionsException with null
+     * as its error detail message.
+     */
+    public UnsupportedOptionsException() {}
+
+    /**
+     * Creates a new UnsupportedOptionsException with the given
+     * error detail message.
+     *
+     * @param       s           error detail message
+     */
+    public UnsupportedOptionsException(String s) {
+        super(s);
+    }
+}
diff --git a/src/org/tukaani/xz/XZ.java b/src/org/tukaani/xz/XZ.java
new file mode 100644
index 0000000..4e0857f
--- /dev/null
+++ b/src/org/tukaani/xz/XZ.java
@@ -0,0 +1,53 @@
+/*
+ * XZ
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+/**
+ * XZ constants.
+ */
+public class XZ {
+    /**
+     * XZ Header Magic Bytes begin a XZ file.
+     * This can be useful to detect XZ compressed data.
+     */
+    public static final byte[] HEADER_MAGIC = {
+            (byte)0xFD, '7', 'z', 'X', 'Z', '\0' };
+
+    /**
+     * XZ Footer Magic Bytes are the last bytes of a XZ Stream.
+     */
+    public static final byte[] FOOTER_MAGIC = { 'Y', 'Z' };
+
+    /**
+     * Integrity check ID indicating that no integrity check is calculated.
+     * <p>
+     * Omitting the integrity check is strongly discouraged except when
+     * the integrity of the data will be verified by other means anyway,
+     * and calculating the check twice would be useless.
+     */
+    public static final int CHECK_NONE = 0;
+
+    /**
+     * Integrity check ID for CRC32.
+     */
+    public static final int CHECK_CRC32 = 1;
+
+    /**
+     * Integrity check ID for CRC64.
+     */
+    public static final int CHECK_CRC64 = 4;
+
+    /**
+     * Integrity check ID for SHA-256.
+     */
+    public static final int CHECK_SHA256 = 10;
+
+    private XZ() {}
+}
diff --git a/src/org/tukaani/xz/XZFormatException.java b/src/org/tukaani/xz/XZFormatException.java
new file mode 100644
index 0000000..6f63020
--- /dev/null
+++ b/src/org/tukaani/xz/XZFormatException.java
@@ -0,0 +1,24 @@
+/*
+ * XZFormatException
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+/**
+ * Thrown when the input data is not in the XZ format.
+ */
+public class XZFormatException extends XZIOException {
+    private static final long serialVersionUID = 3L;
+
+    /**
+     * Creates a new exception with the default error detail message.
+     */
+    public XZFormatException() {
+        super("Input is not in the XZ format");
+    }
+}
diff --git a/src/org/tukaani/xz/XZIOException.java b/src/org/tukaani/xz/XZIOException.java
new file mode 100644
index 0000000..14675f5
--- /dev/null
+++ b/src/org/tukaani/xz/XZIOException.java
@@ -0,0 +1,27 @@
+/*
+ * XZIOException
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+/**
+ * Generic {@link java.io.IOException IOException} specific to this package.
+ * The other IOExceptions in this package extend
+ * from <code>XZIOException</code>.
+ */
+public class XZIOException extends java.io.IOException {
+    private static final long serialVersionUID = 3L;
+
+    public XZIOException() {
+        super();
+    }
+
+    public XZIOException(String s) {
+        super(s);
+    }
+}
diff --git a/src/org/tukaani/xz/XZInputStream.java b/src/org/tukaani/xz/XZInputStream.java
new file mode 100644
index 0000000..680f647
--- /dev/null
+++ b/src/org/tukaani/xz/XZInputStream.java
@@ -0,0 +1,527 @@
+/*
+ * XZInputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.InputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.EOFException;
+import org.tukaani.xz.common.DecoderUtil;
+
+/**
+ * Decompresses a .xz file in streamed mode (no seeking).
+ * <p>
+ * Use this to decompress regular standalone .xz files. This reads from
+ * its input stream until the end of the input or until an error occurs.
+ * This supports decompressing concatenated .xz files.
+ *
+ * <h4>Typical use cases</h4>
+ * <p>
+ * Getting an input stream to decompress a .xz file:
+ * <p><blockquote><pre>
+ * InputStream infile = new FileInputStream("foo.xz");
+ * XZInputStream inxz = new XZInputStream(infile);
+ * </pre></blockquote>
+ * <p>
+ * It's important to keep in mind that decompressor memory usage depends
+ * on the settings used to compress the file. The worst-case memory usage
+ * of XZInputStream is currently 1.5 GiB. Still, very few files will
+ * require more than about 65 MiB because that's how much decompressing
+ * a file created with the highest preset level will need, and only a few
+ * people use settings other than the predefined presets.
+ * <p>
+ * It is possible to specify a memory usage limit for
+ * <code>XZInputStream</code>. If decompression requires more memory than
+ * the specified limit, MemoryLimitException will be thrown when reading
+ * from the stream. For example, the following sets the memory usage limit
+ * to 100 MiB:
+ * <p><blockquote><pre>
+ * InputStream infile = new FileInputStream("foo.xz");
+ * XZInputStream inxz = new XZInputStream(infile, 100 * 1024);
+ * </pre></blockquote>
+ *
+ * <h4>When uncompressed size is known beforehand</h4>
+ * <p>
+ * If you are decompressing complete files and your application knows
+ * exactly how much uncompressed data there should be, it is good to try
+ * reading one more byte by calling <code>read()</code> and checking
+ * that it returns <code>-1</code>. This way the decompressor will parse the
+ * file footers and verify the integrity checks, giving the caller more
+ * confidence that the uncompressed data is valid. (This advice seems to
+ * apply to
+ * {@link java.util.zip.GZIPInputStream java.util.zip.GZIPInputStream} too.)
+ *
+ * @see SingleXZInputStream
+ */
+public class XZInputStream extends InputStream {
+    private final ArrayCache arrayCache;
+
+    private final int memoryLimit;
+    private InputStream in;
+    private SingleXZInputStream xzIn;
+    private final boolean verifyCheck;
+    private boolean endReached = false;
+    private IOException exception = null;
+
+    private final byte[] tempBuf = new byte[1];
+
+    /**
+     * Creates a new XZ decompressor without a memory usage limit.
+     * <p>
+     * This constructor reads and parses the XZ Stream Header (12 bytes)
+     * from <code>in</code>. The header of the first Block is not read
+     * until <code>read</code> is called.
+     *
+     * @param       in          input stream from which XZ-compressed
+     *                          data is read
+     *
+     * @throws      XZFormatException
+     *                          input is not in the XZ format
+     *
+     * @throws      CorruptedInputException
+     *                          XZ header CRC32 doesn't match
+     *
+     * @throws      UnsupportedOptionsException
+     *                          XZ header is valid but specifies options
+     *                          not supported by this implementation
+     *
+     * @throws      EOFException
+     *                          less than 12 bytes of input was available
+     *                          from <code>in</code>
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     */
+    public XZInputStream(InputStream in) throws IOException {
+        this(in, -1);
+    }
+
+    /**
+     * Creates a new XZ decompressor without a memory usage limit.
+     * <p>
+     * This is identical to <code>XZInputStream(InputStream)</code>
+     * except that this takes also the <code>arrayCache</code> argument.
+     *
+     * @param       in          input stream from which XZ-compressed
+     *                          data is read
+     *
+     * @param       arrayCache  cache to be used for allocating large arrays
+     *
+     * @throws      XZFormatException
+     *                          input is not in the XZ format
+     *
+     * @throws      CorruptedInputException
+     *                          XZ header CRC32 doesn't match
+     *
+     * @throws      UnsupportedOptionsException
+     *                          XZ header is valid but specifies options
+     *                          not supported by this implementation
+     *
+     * @throws      EOFException
+     *                          less than 12 bytes of input was available
+     *                          from <code>in</code>
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     *
+     * @since 1.7
+     */
+    public XZInputStream(InputStream in, ArrayCache arrayCache)
+            throws IOException {
+        this(in, -1, arrayCache);
+    }
+
+    /**
+     * Creates a new XZ decompressor with an optional memory usage limit.
+     * <p>
+     * This is identical to <code>XZInputStream(InputStream)</code> except
+     * that this takes also the <code>memoryLimit</code> argument.
+     *
+     * @param       in          input stream from which XZ-compressed
+     *                          data is read
+     *
+     * @param       memoryLimit memory usage limit in kibibytes (KiB)
+     *                          or <code>-1</code> to impose no
+     *                          memory usage limit
+     *
+     * @throws      XZFormatException
+     *                          input is not in the XZ format
+     *
+     * @throws      CorruptedInputException
+     *                          XZ header CRC32 doesn't match
+     *
+     * @throws      UnsupportedOptionsException
+     *                          XZ header is valid but specifies options
+     *                          not supported by this implementation
+     *
+     * @throws      EOFException
+     *                          less than 12 bytes of input was available
+     *                          from <code>in</code>
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     */
+    public XZInputStream(InputStream in, int memoryLimit) throws IOException {
+        this(in, memoryLimit, true);
+    }
+
+    /**
+     * Creates a new XZ decompressor with an optional memory usage limit.
+     * <p>
+     * This is identical to <code>XZInputStream(InputStream)</code> except
+     * that this takes also the <code>memoryLimit</code> and
+     * <code>arrayCache</code> arguments.
+     *
+     * @param       in          input stream from which XZ-compressed
+     *                          data is read
+     *
+     * @param       memoryLimit memory usage limit in kibibytes (KiB)
+     *                          or <code>-1</code> to impose no
+     *                          memory usage limit
+     *
+     * @param       arrayCache  cache to be used for allocating large arrays
+     *
+     * @throws      XZFormatException
+     *                          input is not in the XZ format
+     *
+     * @throws      CorruptedInputException
+     *                          XZ header CRC32 doesn't match
+     *
+     * @throws      UnsupportedOptionsException
+     *                          XZ header is valid but specifies options
+     *                          not supported by this implementation
+     *
+     * @throws      EOFException
+     *                          less than 12 bytes of input was available
+     *                          from <code>in</code>
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     *
+     * @since 1.7
+     */
+    public XZInputStream(InputStream in, int memoryLimit,
+                         ArrayCache arrayCache) throws IOException {
+        this(in, memoryLimit, true, arrayCache);
+    }
+
+    /**
+     * Creates a new XZ decompressor with an optional memory usage limit
+     * and ability to disable verification of integrity checks.
+     * <p>
+     * This is identical to <code>XZInputStream(InputStream,int)</code> except
+     * that this takes also the <code>verifyCheck</code> argument.
+     * <p>
+     * Note that integrity check verification should almost never be disabled.
+     * Possible reasons to disable integrity check verification:
+     * <ul>
+     *   <li>Trying to recover data from a corrupt .xz file.</li>
+     *   <li>Speeding up decompression. This matters mostly with SHA-256
+     *   or with files that have compressed extremely well. It's recommended
+     *   that integrity checking isn't disabled for performance reasons
+     *   unless the file integrity is verified externally in some other
+     *   way.</li>
+     * </ul>
+     * <p>
+     * <code>verifyCheck</code> only affects the integrity check of
+     * the actual compressed data. The CRC32 fields in the headers
+     * are always verified.
+     *
+     * @param       in          input stream from which XZ-compressed
+     *                          data is read
+     *
+     * @param       memoryLimit memory usage limit in kibibytes (KiB)
+     *                          or <code>-1</code> to impose no
+     *                          memory usage limit
+     *
+     * @param       verifyCheck if <code>true</code>, the integrity checks
+     *                          will be verified; this should almost never
+     *                          be set to <code>false</code>
+     *
+     * @throws      XZFormatException
+     *                          input is not in the XZ format
+     *
+     * @throws      CorruptedInputException
+     *                          XZ header CRC32 doesn't match
+     *
+     * @throws      UnsupportedOptionsException
+     *                          XZ header is valid but specifies options
+     *                          not supported by this implementation
+     *
+     * @throws      EOFException
+     *                          less than 12 bytes of input was available
+     *                          from <code>in</code>
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     *
+     * @since 1.6
+     */
+    public XZInputStream(InputStream in, int memoryLimit, boolean verifyCheck)
+            throws IOException {
+        this(in, memoryLimit, verifyCheck, ArrayCache.getDefaultCache());
+    }
+
+    /**
+     * Creates a new XZ decompressor with an optional memory usage limit
+     * and ability to disable verification of integrity checks.
+     * <p>
+     * This is identical to <code>XZInputStream(InputStream,int,boolean)</code>
+     * except that this takes also the <code>arrayCache</code> argument.
+     *
+     * @param       in          input stream from which XZ-compressed
+     *                          data is read
+     *
+     * @param       memoryLimit memory usage limit in kibibytes (KiB)
+     *                          or <code>-1</code> to impose no
+     *                          memory usage limit
+     *
+     * @param       verifyCheck if <code>true</code>, the integrity checks
+     *                          will be verified; this should almost never
+     *                          be set to <code>false</code>
+     *
+     * @param       arrayCache  cache to be used for allocating large arrays
+     *
+     * @throws      XZFormatException
+     *                          input is not in the XZ format
+     *
+     * @throws      CorruptedInputException
+     *                          XZ header CRC32 doesn't match
+     *
+     * @throws      UnsupportedOptionsException
+     *                          XZ header is valid but specifies options
+     *                          not supported by this implementation
+     *
+     * @throws      EOFException
+     *                          less than 12 bytes of input was available
+     *                          from <code>in</code>
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     *
+     * @since 1.7
+     */
+    public XZInputStream(InputStream in, int memoryLimit, boolean verifyCheck,
+                         ArrayCache arrayCache) throws IOException {
+        this.arrayCache = arrayCache;
+        this.in = in;
+        this.memoryLimit = memoryLimit;
+        this.verifyCheck = verifyCheck;
+        this.xzIn = new SingleXZInputStream(in, memoryLimit, verifyCheck,
+                                            arrayCache);
+    }
+
+    /**
+     * Decompresses the next byte from this input stream.
+     * <p>
+     * Reading lots of data with <code>read()</code> from this input stream
+     * may be inefficient. Wrap it in {@link java.io.BufferedInputStream}
+     * if you need to read lots of data one byte at a time.
+     *
+     * @return      the next decompressed byte, or <code>-1</code>
+     *              to indicate the end of the compressed stream
+     *
+     * @throws      CorruptedInputException
+     * @throws      UnsupportedOptionsException
+     * @throws      MemoryLimitException
+     *
+     * @throws      XZIOException if the stream has been closed
+     *
+     * @throws      EOFException
+     *                          compressed input is truncated or corrupt
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     */
+    public int read() throws IOException {
+        return read(tempBuf, 0, 1) == -1 ? -1 : (tempBuf[0] & 0xFF);
+    }
+
+    /**
+     * Decompresses into an array of bytes.
+     * <p>
+     * If <code>len</code> is zero, no bytes are read and <code>0</code>
+     * is returned. Otherwise this will try to decompress <code>len</code>
+     * bytes of uncompressed data. Less than <code>len</code> bytes may
+     * be read only in the following situations:
+     * <ul>
+     *   <li>The end of the compressed data was reached successfully.</li>
+     *   <li>An error is detected after at least one but less <code>len</code>
+     *       bytes have already been successfully decompressed.
+     *       The next call with non-zero <code>len</code> will immediately
+     *       throw the pending exception.</li>
+     *   <li>An exception is thrown.</li>
+     * </ul>
+     *
+     * @param       buf         target buffer for uncompressed data
+     * @param       off         start offset in <code>buf</code>
+     * @param       len         maximum number of uncompressed bytes to read
+     *
+     * @return      number of bytes read, or <code>-1</code> to indicate
+     *              the end of the compressed stream
+     *
+     * @throws      CorruptedInputException
+     * @throws      UnsupportedOptionsException
+     * @throws      MemoryLimitException
+     *
+     * @throws      XZIOException if the stream has been closed
+     *
+     * @throws      EOFException
+     *                          compressed input is truncated or corrupt
+     *
+     * @throws      IOException may be thrown by <code>in</code>
+     */
+    public int read(byte[] buf, int off, int len) throws IOException {
+        if (off < 0 || len < 0 || off + len < 0 || off + len > buf.length)
+            throw new IndexOutOfBoundsException();
+
+        if (len == 0)
+            return 0;
+
+        if (in == null)
+            throw new XZIOException("Stream closed");
+
+        if (exception != null)
+            throw exception;
+
+        if (endReached)
+            return -1;
+
+        int size = 0;
+
+        try {
+            while (len > 0) {
+                if (xzIn == null) {
+                    prepareNextStream();
+                    if (endReached)
+                        return size == 0 ? -1 : size;
+                }
+
+                int ret = xzIn.read(buf, off, len);
+
+                if (ret > 0) {
+                    size += ret;
+                    off += ret;
+                    len -= ret;
+                } else if (ret == -1) {
+                    xzIn = null;
+                }
+            }
+        } catch (IOException e) {
+            exception = e;
+            if (size == 0)
+                throw e;
+        }
+
+        return size;
+    }
+
+    private void prepareNextStream() throws IOException {
+        DataInputStream inData = new DataInputStream(in);
+        byte[] buf = new byte[DecoderUtil.STREAM_HEADER_SIZE];
+
+        // The size of Stream Padding must be a multiple of four bytes,
+        // all bytes zero.
+        do {
+            // First try to read one byte to see if we have reached the end
+            // of the file.
+            int ret = inData.read(buf, 0, 1);
+            if (ret == -1) {
+                endReached = true;
+                return;
+            }
+
+            // Since we got one byte of input, there must be at least
+            // three more available in a valid file.
+            inData.readFully(buf, 1, 3);
+
+        } while (buf[0] == 0 && buf[1] == 0 && buf[2] == 0 && buf[3] == 0);
+
+        // Not all bytes are zero. In a valid Stream it indicates the
+        // beginning of the next Stream. Read the rest of the Stream Header
+        // and initialize the XZ decoder.
+        inData.readFully(buf, 4, DecoderUtil.STREAM_HEADER_SIZE - 4);
+
+        try {
+            xzIn = new SingleXZInputStream(in, memoryLimit, verifyCheck, buf,
+                                           arrayCache);
+        } catch (XZFormatException e) {
+            // Since this isn't the first .xz Stream, it is more
+            // logical to tell that the data is corrupt.
+            throw new CorruptedInputException(
+                    "Garbage after a valid XZ Stream");
+        }
+    }
+
+    /**
+     * Returns the number of uncompressed bytes that can be read
+     * without blocking. The value is returned with an assumption
+     * that the compressed input data will be valid. If the compressed
+     * data is corrupt, <code>CorruptedInputException</code> may get
+     * thrown before the number of bytes claimed to be available have
+     * been read from this input stream.
+     *
+     * @return      the number of uncompressed bytes that can be read
+     *              without blocking
+     */
+    public int available() throws IOException {
+        if (in == null)
+            throw new XZIOException("Stream closed");
+
+        if (exception != null)
+            throw exception;
+
+        return xzIn == null ? 0 : xzIn.available();
+    }
+
+    /**
+     * Closes the stream and calls <code>in.close()</code>.
+     * If the stream was already closed, this does nothing.
+     * <p>
+     * This is equivalent to <code>close(true)</code>.
+     *
+     * @throws  IOException if thrown by <code>in.close()</code>
+     */
+    public void close() throws IOException {
+        close(true);
+    }
+
+    /**
+     * Closes the stream and optionally calls <code>in.close()</code>.
+     * If the stream was already closed, this does nothing.
+     * If <code>close(false)</code> has been called, a further
+     * call of <code>close(true)</code> does nothing (it doesn't call
+     * <code>in.close()</code>).
+     * <p>
+     * If you don't want to close the underlying <code>InputStream</code>,
+     * there is usually no need to worry about closing this stream either;
+     * it's fine to do nothing and let the garbage collector handle it.
+     * However, if you are using {@link ArrayCache}, <code>close(false)</code>
+     * can be useful to put the allocated arrays back to the cache without
+     * closing the underlying <code>InputStream</code>.
+     * <p>
+     * Note that if you successfully reach the end of the stream
+     * (<code>read</code> returns <code>-1</code>), the arrays are
+     * automatically put back to the cache by that <code>read</code> call. In
+     * this situation <code>close(false)</code> is redundant (but harmless).
+     *
+     * @throws  IOException if thrown by <code>in.close()</code>
+     *
+     * @since 1.7
+     */
+    public void close(boolean closeInput) throws IOException {
+        if (in != null) {
+            if (xzIn != null) {
+                xzIn.close(false);
+                xzIn = null;
+            }
+
+            try {
+                if (closeInput)
+                    in.close();
+            } finally {
+                in = null;
+            }
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/XZOutputStream.java b/src/org/tukaani/xz/XZOutputStream.java
new file mode 100644
index 0000000..107ef7f
--- /dev/null
+++ b/src/org/tukaani/xz/XZOutputStream.java
@@ -0,0 +1,606 @@
+/*
+ * XZOutputStream
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz;
+
+import java.io.OutputStream;
+import java.io.IOException;
+import org.tukaani.xz.common.EncoderUtil;
+import org.tukaani.xz.common.StreamFlags;
+import org.tukaani.xz.check.Check;
+import org.tukaani.xz.index.IndexEncoder;
+
+/**
+ * Compresses into the .xz file format.
+ *
+ * <h4>Examples</h4>
+ * <p>
+ * Getting an output stream to compress with LZMA2 using the default
+ * settings and the default integrity check type (CRC64):
+ * <p><blockquote><pre>
+ * FileOutputStream outfile = new FileOutputStream("foo.xz");
+ * XZOutputStream outxz = new XZOutputStream(outfile, new LZMA2Options());
+ * </pre></blockquote>
+ * <p>
+ * Using the preset level <code>8</code> for LZMA2 (the default
+ * is <code>6</code>) and SHA-256 instead of CRC64 for integrity checking:
+ * <p><blockquote><pre>
+ * XZOutputStream outxz = new XZOutputStream(outfile, new LZMA2Options(8),
+ *                                           XZ.CHECK_SHA256);
+ * </pre></blockquote>
+ * <p>
+ * Using the x86 BCJ filter together with LZMA2 to compress x86 executables
+ * and printing the memory usage information before creating the
+ * XZOutputStream:
+ * <p><blockquote><pre>
+ * X86Options x86 = new X86Options();
+ * LZMA2Options lzma2 = new LZMA2Options();
+ * FilterOptions[] options = { x86, lzma2 };
+ * System.out.println("Encoder memory usage: "
+ *                    + FilterOptions.getEncoderMemoryUsage(options)
+ *                    + " KiB");
+ * System.out.println("Decoder memory usage: "
+ *                    + FilterOptions.getDecoderMemoryUsage(options)
+ *                    + " KiB");
+ * XZOutputStream outxz = new XZOutputStream(outfile, options);
+ * </pre></blockquote>
+ */
+public class XZOutputStream extends FinishableOutputStream {
+    private final ArrayCache arrayCache;
+
+    private OutputStream out;
+    private final StreamFlags streamFlags = new StreamFlags();
+    private final Check check;
+    private final IndexEncoder index = new IndexEncoder();
+
+    private BlockOutputStream blockEncoder = null;
+    private FilterEncoder[] filters;
+
+    /**
+     * True if the current filter chain supports flushing.
+     * If it doesn't support flushing, <code>flush()</code>
+     * will use <code>endBlock()</code> as a fallback.
+     */
+    private boolean filtersSupportFlushing;
+
+    private IOException exception = null;
+    private boolean finished = false;
+
+    private final byte[] tempBuf = new byte[1];
+
+    /**
+     * Creates a new XZ compressor using one filter and CRC64 as
+     * the integrity check. This constructor is equivalent to passing
+     * a single-member FilterOptions array to
+     * <code>XZOutputStream(OutputStream, FilterOptions[])</code>.
+     *
+     * @param       out         output stream to which the compressed data
+     *                          will be written
+     *
+     * @param       filterOptions
+     *                          filter options to use
+     *
+     * @throws      UnsupportedOptionsException
+     *                          invalid filter chain
+     *
+     * @throws      IOException may be thrown from <code>out</code>
+     */
+    public XZOutputStream(OutputStream out, FilterOptions filterOptions)
+            throws IOException {
+        this(out, filterOptions, XZ.CHECK_CRC64);
+    }
+
+    /**
+     * Creates a new XZ compressor using one filter and CRC64 as
+     * the integrity check. This constructor is equivalent to passing
+     * a single-member FilterOptions array to
+     * <code>XZOutputStream(OutputStream, FilterOptions[], ArrayCache)</code>.
+     *
+     * @param       out         output stream to which the compressed data
+     *                          will be written
+     *
+     * @param       filterOptions
+     *                          filter options to use
+     *
+     * @param       arrayCache  cache to be used for allocating large arrays
+     *
+     * @throws      UnsupportedOptionsException
+     *                          invalid filter chain
+     *
+     * @throws      IOException may be thrown from <code>out</code>
+     *
+     * @since 1.7
+     */
+    public XZOutputStream(OutputStream out, FilterOptions filterOptions,
+                          ArrayCache arrayCache)
+            throws IOException {
+        this(out, filterOptions, XZ.CHECK_CRC64, arrayCache);
+    }
+
+    /**
+     * Creates a new XZ compressor using one filter and the specified
+     * integrity check type. This constructor is equivalent to
+     * passing a single-member FilterOptions array to
+     * <code>XZOutputStream(OutputStream, FilterOptions[], int)</code>.
+     *
+     * @param       out         output stream to which the compressed data
+     *                          will be written
+     *
+     * @param       filterOptions
+     *                          filter options to use
+     *
+     * @param       checkType   type of the integrity check,
+     *                          for example XZ.CHECK_CRC32
+     *
+     * @throws      UnsupportedOptionsException
+     *                          invalid filter chain
+     *
+     * @throws      IOException may be thrown from <code>out</code>
+     */
+    public XZOutputStream(OutputStream out, FilterOptions filterOptions,
+                          int checkType) throws IOException {
+        this(out, new FilterOptions[] { filterOptions }, checkType);
+    }
+
+    /**
+     * Creates a new XZ compressor using one filter and the specified
+     * integrity check type. This constructor is equivalent to
+     * passing a single-member FilterOptions array to
+     * <code>XZOutputStream(OutputStream, FilterOptions[], int,
+     * ArrayCache)</code>.
+     *
+     * @param       out         output stream to which the compressed data
+     *                          will be written
+     *
+     * @param       filterOptions
+     *                          filter options to use
+     *
+     * @param       checkType   type of the integrity check,
+     *                          for example XZ.CHECK_CRC32
+     *
+     * @param       arrayCache  cache to be used for allocating large arrays
+     *
+     * @throws      UnsupportedOptionsException
+     *                          invalid filter chain
+     *
+     * @throws      IOException may be thrown from <code>out</code>
+     *
+     * @since 1.7
+     */
+    public XZOutputStream(OutputStream out, FilterOptions filterOptions,
+                          int checkType, ArrayCache arrayCache)
+            throws IOException {
+        this(out, new FilterOptions[] { filterOptions }, checkType,
+             arrayCache);
+    }
+
+    /**
+     * Creates a new XZ compressor using 1-4 filters and CRC64 as
+     * the integrity check. This constructor is equivalent
+     * <code>XZOutputStream(out, filterOptions, XZ.CHECK_CRC64)</code>.
+     *
+     * @param       out         output stream to which the compressed data
+     *                          will be written
+     *
+     * @param       filterOptions
+     *                          array of filter options to use
+     *
+     * @throws      UnsupportedOptionsException
+     *                          invalid filter chain
+     *
+     * @throws      IOException may be thrown from <code>out</code>
+     */
+    public XZOutputStream(OutputStream out, FilterOptions[] filterOptions)
+            throws IOException {
+        this(out, filterOptions, XZ.CHECK_CRC64);
+    }
+
+    /**
+     * Creates a new XZ compressor using 1-4 filters and CRC64 as
+     * the integrity check. This constructor is equivalent
+     * <code>XZOutputStream(out, filterOptions, XZ.CHECK_CRC64,
+     * arrayCache)</code>.
+     *
+     * @param       out         output stream to which the compressed data
+     *                          will be written
+     *
+     * @param       filterOptions
+     *                          array of filter options to use
+     *
+     * @param       arrayCache  cache to be used for allocating large arrays
+     *
+     * @throws      UnsupportedOptionsException
+     *                          invalid filter chain
+     *
+     * @throws      IOException may be thrown from <code>out</code>
+     *
+     * @since 1.7
+     */
+    public XZOutputStream(OutputStream out, FilterOptions[] filterOptions,
+                          ArrayCache arrayCache)
+            throws IOException {
+        this(out, filterOptions, XZ.CHECK_CRC64, arrayCache);
+    }
+
+    /**
+     * Creates a new XZ compressor using 1-4 filters and the specified
+     * integrity check type.
+     *
+     * @param       out         output stream to which the compressed data
+     *                          will be written
+     *
+     * @param       filterOptions
+     *                          array of filter options to use
+     *
+     * @param       checkType   type of the integrity check,
+     *                          for example XZ.CHECK_CRC32
+     *
+     * @throws      UnsupportedOptionsException
+     *                          invalid filter chain
+     *
+     * @throws      IOException may be thrown from <code>out</code>
+     */
+    public XZOutputStream(OutputStream out, FilterOptions[] filterOptions,
+                          int checkType) throws IOException {
+        this(out, filterOptions, checkType, ArrayCache.getDefaultCache());
+    }
+
+    /**
+     * Creates a new XZ compressor using 1-4 filters and the specified
+     * integrity check type.
+     *
+     * @param       out         output stream to which the compressed data
+     *                          will be written
+     *
+     * @param       filterOptions
+     *                          array of filter options to use
+     *
+     * @param       checkType   type of the integrity check,
+     *                          for example XZ.CHECK_CRC32
+     *
+     * @param       arrayCache  cache to be used for allocating large arrays
+     *
+     * @throws      UnsupportedOptionsException
+     *                          invalid filter chain
+     *
+     * @throws      IOException may be thrown from <code>out</code>
+     *
+     * @since 1.7
+     */
+    public XZOutputStream(OutputStream out, FilterOptions[] filterOptions,
+                          int checkType, ArrayCache arrayCache)
+            throws IOException {
+        this.arrayCache = arrayCache;
+        this.out = out;
+        updateFilters(filterOptions);
+
+        streamFlags.checkType = checkType;
+        check = Check.getInstance(checkType);
+
+        encodeStreamHeader();
+    }
+
+    /**
+     * Updates the filter chain with a single filter.
+     * This is equivalent to passing a single-member FilterOptions array
+     * to <code>updateFilters(FilterOptions[])</code>.
+     *
+     * @param       filterOptions
+     *                          new filter to use
+     *
+     * @throws      UnsupportedOptionsException
+     *                          unsupported filter chain, or trying to change
+     *                          the filter chain in the middle of a Block
+     */
+    public void updateFilters(FilterOptions filterOptions)
+            throws XZIOException {
+        FilterOptions[] opts = new FilterOptions[1];
+        opts[0] = filterOptions;
+        updateFilters(opts);
+    }
+
+    /**
+     * Updates the filter chain with 1-4 filters.
+     * <p>
+     * Currently this cannot be used to update e.g. LZMA2 options in the
+     * middle of a XZ Block. Use <code>endBlock()</code> to finish the
+     * current XZ Block before calling this function. The new filter chain
+     * will then be used for the next XZ Block.
+     *
+     * @param       filterOptions
+     *                          new filter chain to use
+     *
+     * @throws      UnsupportedOptionsException
+     *                          unsupported filter chain, or trying to change
+     *                          the filter chain in the middle of a Block
+     */
+    public void updateFilters(FilterOptions[] filterOptions)
+            throws XZIOException {
+        if (blockEncoder != null)
+            throw new UnsupportedOptionsException("Changing filter options "
+                    + "in the middle of a XZ Block not implemented");
+
+        if (filterOptions.length < 1 || filterOptions.length > 4)
+            throw new UnsupportedOptionsException(
+                        "XZ filter chain must be 1-4 filters");
+
+        filtersSupportFlushing = true;
+        FilterEncoder[] newFilters = new FilterEncoder[filterOptions.length];
+        for (int i = 0; i < filterOptions.length; ++i) {
+            newFilters[i] = filterOptions[i].getFilterEncoder();
+            filtersSupportFlushing &= newFilters[i].supportsFlushing();
+        }
+
+        RawCoder.validate(newFilters);
+        filters = newFilters;
+    }
+
+    /**
+     * Writes one byte to be compressed.
+     *
+     * @throws      XZIOException
+     *                          XZ Stream has grown too big
+     *
+     * @throws      XZIOException
+     *                          <code>finish()</code> or <code>close()</code>
+     *                          was already called
+     *
+     * @throws      IOException may be thrown by the underlying output stream
+     */
+    public void write(int b) throws IOException {
+        tempBuf[0] = (byte)b;
+        write(tempBuf, 0, 1);
+    }
+
+    /**
+     * Writes an array of bytes to be compressed.
+     * The compressors tend to do internal buffering and thus the written
+     * data won't be readable from the compressed output immediately.
+     * Use <code>flush()</code> to force everything written so far to
+     * be written to the underlaying output stream, but be aware that
+     * flushing reduces compression ratio.
+     *
+     * @param       buf         buffer of bytes to be written
+     * @param       off         start offset in <code>buf</code>
+     * @param       len         number of bytes to write
+     *
+     * @throws      XZIOException
+     *                          XZ Stream has grown too big: total file size
+     *                          about 8 EiB or the Index field exceeds
+     *                          16 GiB; you shouldn't reach these sizes
+     *                          in practice
+     *
+     * @throws      XZIOException
+     *                          <code>finish()</code> or <code>close()</code>
+     *                          was already called and len > 0
+     *
+     * @throws      IOException may be thrown by the underlying output stream
+     */
+    public void write(byte[] buf, int off, int len) throws IOException {
+        if (off < 0 || len < 0 || off + len < 0 || off + len > buf.length)
+            throw new IndexOutOfBoundsException();
+
+        if (exception != null)
+            throw exception;
+
+        if (finished)
+            throw new XZIOException("Stream finished or closed");
+
+        try {
+            if (blockEncoder == null)
+                blockEncoder = new BlockOutputStream(out, filters, check,
+                                                     arrayCache);
+
+            blockEncoder.write(buf, off, len);
+        } catch (IOException e) {
+            exception = e;
+            throw e;
+        }
+    }
+
+    /**
+     * Finishes the current XZ Block (but not the whole XZ Stream).
+     * This doesn't flush the stream so it's possible that not all data will
+     * be decompressible from the output stream when this function returns.
+     * Call also <code>flush()</code> if flushing is wanted in addition to
+     * finishing the current XZ Block.
+     * <p>
+     * If there is no unfinished Block open, this function will do nothing.
+     * (No empty XZ Block will be created.)
+     * <p>
+     * This function can be useful, for example, to create
+     * random-accessible .xz files.
+     * <p>
+     * Starting a new XZ Block means that the encoder state is reset.
+     * Doing this very often will increase the size of the compressed
+     * file a lot (more than plain <code>flush()</code> would do).
+     *
+     * @throws      XZIOException
+     *                          XZ Stream has grown too big
+     *
+     * @throws      XZIOException
+     *                          stream finished or closed
+     *
+     * @throws      IOException may be thrown by the underlying output stream
+     */
+    public void endBlock() throws IOException {
+        if (exception != null)
+            throw exception;
+
+        if (finished)
+            throw new XZIOException("Stream finished or closed");
+
+        // NOTE: Once there is threading with multiple Blocks, it's possible
+        // that this function will be more like a barrier that returns
+        // before the last Block has been finished.
+        if (blockEncoder != null) {
+            try {
+                blockEncoder.finish();
+                index.add(blockEncoder.getUnpaddedSize(),
+                          blockEncoder.getUncompressedSize());
+                blockEncoder = null;
+            } catch (IOException e) {
+                exception = e;
+                throw e;
+            }
+        }
+    }
+
+    /**
+     * Flushes the encoder and calls <code>out.flush()</code>.
+     * All buffered pending data will then be decompressible from
+     * the output stream.
+     * <p>
+     * Calling this function very often may increase the compressed
+     * file size a lot. The filter chain options may affect the size
+     * increase too. For example, with LZMA2 the HC4 match finder has
+     * smaller penalty with flushing than BT4.
+     * <p>
+     * Some filters don't support flushing. If the filter chain has
+     * such a filter, <code>flush()</code> will call <code>endBlock()</code>
+     * before flushing.
+     *
+     * @throws      XZIOException
+     *                          XZ Stream has grown too big
+     *
+     * @throws      XZIOException
+     *                          stream finished or closed
+     *
+     * @throws      IOException may be thrown by the underlying output stream
+     */
+    public void flush() throws IOException {
+        if (exception != null)
+            throw exception;
+
+        if (finished)
+            throw new XZIOException("Stream finished or closed");
+
+        try {
+            if (blockEncoder != null) {
+                if (filtersSupportFlushing) {
+                    // This will eventually call out.flush() so
+                    // no need to do it here again.
+                    blockEncoder.flush();
+                } else {
+                    endBlock();
+                    out.flush();
+                }
+            } else {
+                out.flush();
+            }
+        } catch (IOException e) {
+            exception = e;
+            throw e;
+        }
+    }
+
+    /**
+     * Finishes compression without closing the underlying stream.
+     * No more data can be written to this stream after finishing
+     * (calling <code>write</code> with an empty buffer is OK).
+     * <p>
+     * Repeated calls to <code>finish()</code> do nothing unless
+     * an exception was thrown by this stream earlier. In that case
+     * the same exception is thrown again.
+     * <p>
+     * After finishing, the stream may be closed normally with
+     * <code>close()</code>. If the stream will be closed anyway, there
+     * usually is no need to call <code>finish()</code> separately.
+     *
+     * @throws      XZIOException
+     *                          XZ Stream has grown too big
+     *
+     * @throws      IOException may be thrown by the underlying output stream
+     */
+    public void finish() throws IOException {
+        if (!finished) {
+            // This checks for pending exceptions so we don't need to
+            // worry about it here.
+            endBlock();
+
+            try {
+                index.encode(out);
+                encodeStreamFooter();
+            } catch (IOException e) {
+                exception = e;
+                throw e;
+            }
+
+            // Set it to true only if everything goes fine. Setting it earlier
+            // would cause repeated calls to finish() do nothing instead of
+            // throwing an exception to indicate an earlier error.
+            finished = true;
+        }
+    }
+
+    /**
+     * Finishes compression and closes the underlying stream.
+     * The underlying stream <code>out</code> is closed even if finishing
+     * fails. If both finishing and closing fail, the exception thrown
+     * by <code>finish()</code> is thrown and the exception from the failed
+     * <code>out.close()</code> is lost.
+     *
+     * @throws      XZIOException
+     *                          XZ Stream has grown too big
+     *
+     * @throws      IOException may be thrown by the underlying output stream
+     */
+    public void close() throws IOException {
+        if (out != null) {
+            // If finish() throws an exception, it stores the exception to
+            // the variable "exception". So we can ignore the possible
+            // exception here.
+            try {
+                finish();
+            } catch (IOException e) {}
+
+            try {
+                out.close();
+            } catch (IOException e) {
+                // Remember the exception but only if there is no previous
+                // pending exception.
+                if (exception == null)
+                    exception = e;
+            }
+
+            out = null;
+        }
+
+        if (exception != null)
+            throw exception;
+    }
+
+    private void encodeStreamFlags(byte[] buf, int off) {
+        buf[off] = 0x00;
+        buf[off + 1] = (byte)streamFlags.checkType;
+    }
+
+    private void encodeStreamHeader() throws IOException {
+        out.write(XZ.HEADER_MAGIC);
+
+        byte[] buf = new byte[2];
+        encodeStreamFlags(buf, 0);
+        out.write(buf);
+
+        EncoderUtil.writeCRC32(out, buf);
+    }
+
+    private void encodeStreamFooter() throws IOException {
+        byte[] buf = new byte[6];
+        long backwardSize = index.getIndexSize() / 4 - 1;
+        for (int i = 0; i < 4; ++i)
+            buf[i] = (byte)(backwardSize >>> (i * 8));
+
+        encodeStreamFlags(buf, 4);
+
+        EncoderUtil.writeCRC32(out, buf);
+        out.write(buf);
+        out.write(XZ.FOOTER_MAGIC);
+    }
+}
diff --git a/src/org/tukaani/xz/check/CRC32.java b/src/org/tukaani/xz/check/CRC32.java
new file mode 100644
index 0000000..f182898
--- /dev/null
+++ b/src/org/tukaani/xz/check/CRC32.java
@@ -0,0 +1,33 @@
+/*
+ * CRC32
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.check;
+
+public class CRC32 extends Check {
+    private final java.util.zip.CRC32 state = new java.util.zip.CRC32();
+
+    public CRC32() {
+        size = 4;
+        name = "CRC32";
+    }
+
+    public void update(byte[] buf, int off, int len) {
+        state.update(buf, off, len);
+    }
+
+    public byte[] finish() {
+        long value = state.getValue();
+        byte[] buf = { (byte)(value),
+                       (byte)(value >>> 8),
+                       (byte)(value >>> 16),
+                       (byte)(value >>> 24) };
+        state.reset();
+        return buf;
+    }
+}
diff --git a/src/org/tukaani/xz/check/CRC64.java b/src/org/tukaani/xz/check/CRC64.java
new file mode 100644
index 0000000..02b15b7
--- /dev/null
+++ b/src/org/tukaani/xz/check/CRC64.java
@@ -0,0 +1,54 @@
+/*
+ * CRC64
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.check;
+
+public class CRC64 extends Check {
+    private static final long poly = 0xC96C5795D7870F42L;
+    private static final long[] crcTable = new long[256];
+
+    private long crc = -1;
+
+    static {
+        for (int b = 0; b < crcTable.length; ++b) {
+                long r = b;
+                for (int i = 0; i < 8; ++i) {
+                        if ((r & 1) == 1)
+                                r = (r >>> 1) ^ poly;
+                        else
+                                r >>>= 1;
+                }
+
+                crcTable[b] = r;
+        }
+    }
+
+    public CRC64() {
+        size = 8;
+        name = "CRC64";
+    }
+
+    public void update(byte[] buf, int off, int len) {
+        int end = off + len;
+
+        while (off < end)
+            crc = crcTable[(buf[off++] ^ (int)crc) & 0xFF] ^ (crc >>> 8);
+    }
+
+    public byte[] finish() {
+        long value = ~crc;
+        crc = -1;
+
+        byte[] buf = new byte[8];
+        for (int i = 0; i < buf.length; ++i)
+            buf[i] = (byte)(value >> (i * 8));
+
+        return buf;
+    }
+}
diff --git a/src/org/tukaani/xz/check/Check.java b/src/org/tukaani/xz/check/Check.java
new file mode 100644
index 0000000..02c011e
--- /dev/null
+++ b/src/org/tukaani/xz/check/Check.java
@@ -0,0 +1,57 @@
+/*
+ * Check
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.check;
+
+import org.tukaani.xz.XZ;
+import org.tukaani.xz.UnsupportedOptionsException;
+
+public abstract class Check {
+    int size;
+    String name;
+
+    public abstract void update(byte[] buf, int off, int len);
+    public abstract byte[] finish();
+
+    public void update(byte[] buf) {
+        update(buf, 0, buf.length);
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static Check getInstance(int checkType)
+            throws UnsupportedOptionsException {
+        switch (checkType) {
+            case XZ.CHECK_NONE:
+                return new None();
+
+            case XZ.CHECK_CRC32:
+                return new CRC32();
+
+            case XZ.CHECK_CRC64:
+                return new CRC64();
+
+            case XZ.CHECK_SHA256:
+                try {
+                    return new SHA256();
+                } catch (java.security.NoSuchAlgorithmException e) {}
+
+                break;
+        }
+
+        throw new UnsupportedOptionsException(
+                "Unsupported Check ID " + checkType);
+    }
+}
diff --git a/src/org/tukaani/xz/check/None.java b/src/org/tukaani/xz/check/None.java
new file mode 100644
index 0000000..b07c8e6
--- /dev/null
+++ b/src/org/tukaani/xz/check/None.java
@@ -0,0 +1,24 @@
+/*
+ * None
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.check;
+
+public class None extends Check {
+    public None() {
+        size = 0;
+        name = "None";
+    }
+
+    public void update(byte[] buf, int off, int len) {}
+
+    public byte[] finish() {
+        byte[] empty = new byte[0];
+        return empty;
+    }
+}
diff --git a/src/org/tukaani/xz/check/SHA256.java b/src/org/tukaani/xz/check/SHA256.java
new file mode 100644
index 0000000..66503c7
--- /dev/null
+++ b/src/org/tukaani/xz/check/SHA256.java
@@ -0,0 +1,30 @@
+/*
+ * SHA256
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.check;
+
+public class SHA256 extends Check {
+    private final java.security.MessageDigest sha256;
+
+    public SHA256() throws java.security.NoSuchAlgorithmException {
+        size = 32;
+        name = "SHA-256";
+        sha256 = java.security.MessageDigest.getInstance("SHA-256");
+    }
+
+    public void update(byte[] buf, int off, int len) {
+        sha256.update(buf, off, len);
+    }
+
+    public byte[] finish() {
+        byte[] buf = sha256.digest();
+        sha256.reset();
+        return buf;
+    }
+}
diff --git a/src/org/tukaani/xz/common/DecoderUtil.java b/src/org/tukaani/xz/common/DecoderUtil.java
new file mode 100644
index 0000000..77ba441
--- /dev/null
+++ b/src/org/tukaani/xz/common/DecoderUtil.java
@@ -0,0 +1,121 @@
+/*
+ * DecoderUtil
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.common;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.EOFException;
+import java.util.zip.CRC32;
+import org.tukaani.xz.XZ;
+import org.tukaani.xz.XZFormatException;
+import org.tukaani.xz.CorruptedInputException;
+import org.tukaani.xz.UnsupportedOptionsException;
+
+public class DecoderUtil extends Util {
+    public static boolean isCRC32Valid(byte[] buf, int off, int len,
+                                       int ref_off) {
+        CRC32 crc32 = new CRC32();
+        crc32.update(buf, off, len);
+        long value = crc32.getValue();
+
+        for (int i = 0; i < 4; ++i)
+            if ((byte)(value >>> (i * 8)) != buf[ref_off + i])
+                return false;
+
+        return true;
+    }
+
+    public static StreamFlags decodeStreamHeader(byte[] buf)
+            throws IOException {
+        for (int i = 0; i < XZ.HEADER_MAGIC.length; ++i)
+            if (buf[i] != XZ.HEADER_MAGIC[i])
+                throw new XZFormatException();
+
+        if (!isCRC32Valid(buf, XZ.HEADER_MAGIC.length, 2,
+                          XZ.HEADER_MAGIC.length + 2))
+            throw new CorruptedInputException("XZ Stream Header is corrupt");
+
+        try {
+            return decodeStreamFlags(buf, XZ.HEADER_MAGIC.length);
+        } catch (UnsupportedOptionsException e) {
+            throw new UnsupportedOptionsException(
+                    "Unsupported options in XZ Stream Header");
+        }
+    }
+
+    public static StreamFlags decodeStreamFooter(byte[] buf)
+            throws IOException {
+        if (buf[10] != XZ.FOOTER_MAGIC[0] || buf[11] != XZ.FOOTER_MAGIC[1]) {
+            // NOTE: The exception could be XZFormatException too.
+            // It depends on the situation which one is better.
+            throw new CorruptedInputException("XZ Stream Footer is corrupt");
+        }
+
+        if (!isCRC32Valid(buf, 4, 6, 0))
+            throw new CorruptedInputException("XZ Stream Footer is corrupt");
+
+        StreamFlags streamFlags;
+        try {
+            streamFlags = decodeStreamFlags(buf, 8);
+        } catch (UnsupportedOptionsException e) {
+            throw new UnsupportedOptionsException(
+                    "Unsupported options in XZ Stream Footer");
+        }
+
+        streamFlags.backwardSize = 0;
+        for (int i = 0; i < 4; ++i)
+            streamFlags.backwardSize |= (buf[i + 4] & 0xFF) << (i * 8);
+
+        streamFlags.backwardSize = (streamFlags.backwardSize + 1) * 4;
+
+        return streamFlags;
+    }
+
+    private static StreamFlags decodeStreamFlags(byte[] buf, int off)
+            throws UnsupportedOptionsException {
+        if (buf[off] != 0x00 || (buf[off + 1] & 0xFF) >= 0x10)
+            throw new UnsupportedOptionsException();
+
+        StreamFlags streamFlags = new StreamFlags();
+        streamFlags.checkType = buf[off + 1];
+
+        return streamFlags;
+    }
+
+    public static boolean areStreamFlagsEqual(StreamFlags a, StreamFlags b) {
+        // backwardSize is intentionally not compared.
+        return a.checkType == b.checkType;
+    }
+
+    public static long decodeVLI(InputStream in) throws IOException {
+        int b = in.read();
+        if (b == -1)
+            throw new EOFException();
+
+        long num = b & 0x7F;
+        int i = 0;
+
+        while ((b & 0x80) != 0x00) {
+            if (++i >= VLI_SIZE_MAX)
+                throw new CorruptedInputException();
+
+            b = in.read();
+            if (b == -1)
+                throw new EOFException();
+
+            if (b == 0x00)
+                throw new CorruptedInputException();
+
+            num |= (long)(b & 0x7F) << (i * 7);
+        }
+
+        return num;
+    }
+}
diff --git a/src/org/tukaani/xz/common/EncoderUtil.java b/src/org/tukaani/xz/common/EncoderUtil.java
new file mode 100644
index 0000000..57f688b
--- /dev/null
+++ b/src/org/tukaani/xz/common/EncoderUtil.java
@@ -0,0 +1,36 @@
+/*
+ * EncoderUtil
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.common;
+
+import java.io.OutputStream;
+import java.io.IOException;
+import java.util.zip.CRC32;
+
+public class EncoderUtil extends Util {
+    public static void writeCRC32(OutputStream out, byte[] buf)
+            throws IOException {
+        CRC32 crc32 = new CRC32();
+        crc32.update(buf);
+        long value = crc32.getValue();
+
+        for (int i = 0; i < 4; ++i)
+            out.write((byte)(value >>> (i * 8)));
+    }
+
+    public static void encodeVLI(OutputStream out, long num)
+            throws IOException {
+        while (num >= 0x80) {
+            out.write((byte)(num | 0x80));
+            num >>>= 7;
+        }
+
+        out.write((byte)num);
+    }
+}
diff --git a/src/org/tukaani/xz/common/StreamFlags.java b/src/org/tukaani/xz/common/StreamFlags.java
new file mode 100644
index 0000000..b306987
--- /dev/null
+++ b/src/org/tukaani/xz/common/StreamFlags.java
@@ -0,0 +1,15 @@
+/*
+ * StreamFlags
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.common;
+
+public class StreamFlags {
+    public int checkType = -1;
+    public long backwardSize = -1;
+}
diff --git a/src/org/tukaani/xz/common/Util.java b/src/org/tukaani/xz/common/Util.java
new file mode 100644
index 0000000..c4324ce
--- /dev/null
+++ b/src/org/tukaani/xz/common/Util.java
@@ -0,0 +1,28 @@
+/*
+ * Util
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.common;
+
+public class Util {
+    public static final int STREAM_HEADER_SIZE = 12;
+    public static final long BACKWARD_SIZE_MAX = 1L << 34;
+    public static final int BLOCK_HEADER_SIZE_MAX = 1024;
+    public static final long VLI_MAX = Long.MAX_VALUE;
+    public static final int VLI_SIZE_MAX = 9;
+
+    public static int getVLISize(long num) {
+        int size = 0;
+        do {
+            ++size;
+            num >>= 7;
+        } while (num != 0);
+
+        return size;
+    }
+}
diff --git a/src/org/tukaani/xz/delta/DeltaCoder.java b/src/org/tukaani/xz/delta/DeltaCoder.java
new file mode 100644
index 0000000..d94eb66
--- /dev/null
+++ b/src/org/tukaani/xz/delta/DeltaCoder.java
@@ -0,0 +1,27 @@
+/*
+ * DeltaCoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.delta;
+
+abstract class DeltaCoder {
+    static final int DISTANCE_MIN = 1;
+    static final int DISTANCE_MAX = 256;
+    static final int DISTANCE_MASK = DISTANCE_MAX - 1;
+
+    final int distance;
+    final byte[] history = new byte[DISTANCE_MAX];
+    int pos = 0;
+
+    DeltaCoder(int distance) {
+        if (distance < DISTANCE_MIN || distance > DISTANCE_MAX)
+            throw new IllegalArgumentException();
+
+        this.distance = distance;
+    }
+}
diff --git a/src/org/tukaani/xz/delta/DeltaDecoder.java b/src/org/tukaani/xz/delta/DeltaDecoder.java
new file mode 100644
index 0000000..154cbf3
--- /dev/null
+++ b/src/org/tukaani/xz/delta/DeltaDecoder.java
@@ -0,0 +1,24 @@
+/*
+ * DeltaDecoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.delta;
+
+public class DeltaDecoder extends DeltaCoder {
+    public DeltaDecoder(int distance) {
+        super(distance);
+    }
+
+    public void decode(byte[] buf, int off, int len) {
+        int end = off + len;
+        for (int i = off; i < end; ++i) {
+            buf[i] += history[(distance + pos) & DISTANCE_MASK];
+            history[pos-- & DISTANCE_MASK] = buf[i];
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/delta/DeltaEncoder.java b/src/org/tukaani/xz/delta/DeltaEncoder.java
new file mode 100644
index 0000000..17accce
--- /dev/null
+++ b/src/org/tukaani/xz/delta/DeltaEncoder.java
@@ -0,0 +1,24 @@
+/*
+ * DeltaEncoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.delta;
+
+public class DeltaEncoder extends DeltaCoder {
+    public DeltaEncoder(int distance) {
+        super(distance);
+    }
+
+    public void encode(byte[] in, int in_off, int len, byte[] out) {
+        for (int i = 0; i < len; ++i) {
+            byte tmp = history[(distance + pos) & DISTANCE_MASK];
+            history[pos-- & DISTANCE_MASK] = in[in_off + i];
+            out[i] = (byte)(in[in_off + i] - tmp);
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/index/BlockInfo.java b/src/org/tukaani/xz/index/BlockInfo.java
new file mode 100644
index 0000000..babae7f
--- /dev/null
+++ b/src/org/tukaani/xz/index/BlockInfo.java
@@ -0,0 +1,38 @@
+/*
+ * BlockInfo
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.index;
+
+import org.tukaani.xz.common.StreamFlags;
+
+public class BlockInfo {
+    public int blockNumber = -1;
+    public long compressedOffset = -1;
+    public long uncompressedOffset = -1;
+    public long unpaddedSize = -1;
+    public long uncompressedSize = -1;
+
+    IndexDecoder index;
+
+    public BlockInfo(IndexDecoder indexOfFirstStream) {
+        index = indexOfFirstStream;
+    }
+
+    public int getCheckType() {
+        return index.getStreamFlags().checkType;
+    }
+
+    public boolean hasNext() {
+        return index.hasRecord(blockNumber + 1);
+    }
+
+    public void setNext() {
+        index.setBlockInfo(this, blockNumber + 1);
+    }
+}
diff --git a/src/org/tukaani/xz/index/IndexBase.java b/src/org/tukaani/xz/index/IndexBase.java
new file mode 100644
index 0000000..e556105
--- /dev/null
+++ b/src/org/tukaani/xz/index/IndexBase.java
@@ -0,0 +1,56 @@
+/*
+ * IndexBase
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.index;
+
+import org.tukaani.xz.common.Util;
+import org.tukaani.xz.XZIOException;
+
+abstract class IndexBase {
+    private final XZIOException invalidIndexException;
+    long blocksSum = 0;
+    long uncompressedSum = 0;
+    long indexListSize = 0;
+    long recordCount = 0;
+
+    IndexBase(XZIOException invalidIndexException) {
+        this.invalidIndexException = invalidIndexException;
+    }
+
+    private long getUnpaddedIndexSize() {
+        // Index Indicator + Number of Records + List of Records + CRC32
+        return 1 + Util.getVLISize(recordCount) + indexListSize + 4;
+    }
+
+    public long getIndexSize() {
+        return (getUnpaddedIndexSize() + 3) & ~3;
+    }
+
+    public long getStreamSize() {
+        return Util.STREAM_HEADER_SIZE + blocksSum + getIndexSize()
+                + Util.STREAM_HEADER_SIZE;
+    }
+
+    int getIndexPaddingSize() {
+        return (int)((4 - getUnpaddedIndexSize()) & 3);
+    }
+
+    void add(long unpaddedSize, long uncompressedSize) throws XZIOException {
+        blocksSum += (unpaddedSize + 3) & ~3;
+        uncompressedSum += uncompressedSize;
+        indexListSize += Util.getVLISize(unpaddedSize)
+                         + Util.getVLISize(uncompressedSize);
+        ++recordCount;
+
+        if (blocksSum < 0 || uncompressedSum < 0
+                || getIndexSize() > Util.BACKWARD_SIZE_MAX
+                || getStreamSize() < 0)
+            throw invalidIndexException;
+    }
+}
diff --git a/src/org/tukaani/xz/index/IndexDecoder.java b/src/org/tukaani/xz/index/IndexDecoder.java
new file mode 100644
index 0000000..a3ae986
--- /dev/null
+++ b/src/org/tukaani/xz/index/IndexDecoder.java
@@ -0,0 +1,223 @@
+/*
+ * IndexDecoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.index;
+
+import java.io.IOException;
+import java.io.EOFException;
+import java.util.zip.CheckedInputStream;
+import org.tukaani.xz.common.DecoderUtil;
+import org.tukaani.xz.common.StreamFlags;
+import org.tukaani.xz.SeekableInputStream;
+import org.tukaani.xz.CorruptedInputException;
+import org.tukaani.xz.MemoryLimitException;
+import org.tukaani.xz.UnsupportedOptionsException;
+
+public class IndexDecoder extends IndexBase {
+    private final StreamFlags streamFlags;
+    private final long streamPadding;
+    private final int memoryUsage;
+
+    // Unpadded Size and Uncompressed Size fields
+    private final long[] unpadded;
+    private final long[] uncompressed;
+
+    // Uncompressed size of the largest Block. It is used by
+    // SeekableXZInputStream to find out the largest Block of the .xz file.
+    private long largestBlockSize = 0;
+
+    // Offsets relative to the beginning of the .xz file. These are all zero
+    // for the first Stream in the file.
+    private int recordOffset = 0;
+    private long compressedOffset = 0;
+    private long uncompressedOffset = 0;
+
+    public IndexDecoder(SeekableInputStream in, StreamFlags streamFooterFlags,
+                        long streamPadding, int memoryLimit)
+            throws IOException {
+        super(new CorruptedInputException("XZ Index is corrupt"));
+        this.streamFlags = streamFooterFlags;
+        this.streamPadding = streamPadding;
+
+        // If endPos is exceeded before the CRC32 field has been decoded,
+        // the Index is corrupt.
+        long endPos = in.position() + streamFooterFlags.backwardSize - 4;
+
+        java.util.zip.CRC32 crc32 = new java.util.zip.CRC32();
+        CheckedInputStream inChecked = new CheckedInputStream(in, crc32);
+
+        // Index Indicator
+        if (inChecked.read() != 0x00)
+            throw new CorruptedInputException("XZ Index is corrupt");
+
+        try {
+            // Number of Records
+            long count = DecoderUtil.decodeVLI(inChecked);
+
+            // Catch Record counts that obviously too high to be valid.
+            // This test isn't exact because it ignores Index Indicator,
+            // Number of Records, and CRC32 fields, but this is good enough
+            // to catch the most obvious problems.
+            if (count >= streamFooterFlags.backwardSize / 2)
+                throw new CorruptedInputException("XZ Index is corrupt");
+
+            // If the Record count doesn't fit into an int, we cannot
+            // allocate the arrays to hold the Records.
+            if (count > Integer.MAX_VALUE)
+                throw new UnsupportedOptionsException("XZ Index has over "
+                        + Integer.MAX_VALUE + " Records");
+
+            // Calculate approximate memory requirements and check the
+            // memory usage limit.
+            memoryUsage = 1 + (int)((16L * count + 1023) / 1024);
+            if (memoryLimit >= 0 && memoryUsage > memoryLimit)
+                throw new MemoryLimitException(memoryUsage, memoryLimit);
+
+            // Allocate the arrays for the Records.
+            unpadded = new long[(int)count];
+            uncompressed = new long[(int)count];
+            int record = 0;
+
+            // Decode the Records.
+            for (int i = (int)count; i > 0; --i) {
+                // Get the next Record.
+                long unpaddedSize = DecoderUtil.decodeVLI(inChecked);
+                long uncompressedSize = DecoderUtil.decodeVLI(inChecked);
+
+                // Check that the input position stays sane. Since this is
+                // checked only once per loop iteration instead of for
+                // every input byte read, it's still possible that
+                // EOFException gets thrown with corrupt input.
+                if (in.position() > endPos)
+                    throw new CorruptedInputException("XZ Index is corrupt");
+
+                // Add the new Record.
+                unpadded[record] = blocksSum + unpaddedSize;
+                uncompressed[record] = uncompressedSum + uncompressedSize;
+                ++record;
+                super.add(unpaddedSize, uncompressedSize);
+                assert record == recordCount;
+
+                // Remember the uncompressed size of the largest Block.
+                if (largestBlockSize < uncompressedSize)
+                    largestBlockSize = uncompressedSize;
+            }
+        } catch (EOFException e) {
+            // EOFException is caught just in case a corrupt input causes
+            // DecoderUtil.decodeVLI to read too much at once.
+            throw new CorruptedInputException("XZ Index is corrupt");
+        }
+
+        // Validate that the size of the Index field matches
+        // Backward Size.
+        int indexPaddingSize = getIndexPaddingSize();
+        if (in.position() + indexPaddingSize != endPos)
+            throw new CorruptedInputException("XZ Index is corrupt");
+
+        // Index Padding
+        while (indexPaddingSize-- > 0)
+            if (inChecked.read() != 0x00)
+                throw new CorruptedInputException("XZ Index is corrupt");
+
+        // CRC32
+        long value = crc32.getValue();
+        for (int i = 0; i < 4; ++i)
+            if (((value >>> (i * 8)) & 0xFF) != in.read())
+                throw new CorruptedInputException("XZ Index is corrupt");
+    }
+
+    public void setOffsets(IndexDecoder prev) {
+        // NOTE: SeekableXZInputStream checks that the total number of Blocks
+        // in concatenated Streams fits into an int.
+        recordOffset = prev.recordOffset + (int)prev.recordCount;
+        compressedOffset = prev.compressedOffset
+                           + prev.getStreamSize() + prev.streamPadding;
+        assert (compressedOffset & 3) == 0;
+        uncompressedOffset = prev.uncompressedOffset + prev.uncompressedSum;
+    }
+
+    public int getMemoryUsage() {
+        return memoryUsage;
+    }
+
+    public StreamFlags getStreamFlags() {
+        return streamFlags;
+    }
+
+    public int getRecordCount() {
+        // It was already checked in the constructor that it fits into an int.
+        // Otherwise we couldn't have allocated the arrays.
+        return (int)recordCount;
+    }
+
+    public long getUncompressedSize() {
+        return uncompressedSum;
+    }
+
+    public long getLargestBlockSize() {
+        return largestBlockSize;
+    }
+
+    public boolean hasUncompressedOffset(long pos) {
+        return pos >= uncompressedOffset
+               && pos < uncompressedOffset + uncompressedSum;
+    }
+
+    public boolean hasRecord(int blockNumber) {
+        return blockNumber >= recordOffset
+               && blockNumber < recordOffset + recordCount;
+    }
+
+    public void locateBlock(BlockInfo info, long target) {
+        assert target >= uncompressedOffset;
+        target -= uncompressedOffset;
+        assert target < uncompressedSum;
+
+        int left = 0;
+        int right = unpadded.length - 1;
+
+        while (left < right) {
+            int i = left + (right - left) / 2;
+
+            if (uncompressed[i] <= target)
+                left = i + 1;
+            else
+                right = i;
+        }
+
+        setBlockInfo(info, recordOffset + left);
+    }
+
+    public void setBlockInfo(BlockInfo info, int blockNumber) {
+        // The caller has checked that the given Block number is inside
+        // this Index.
+        assert blockNumber >= recordOffset;
+        assert blockNumber - recordOffset < recordCount;
+
+        info.index = this;
+        info.blockNumber = blockNumber;
+
+        int pos = blockNumber - recordOffset;
+
+        if (pos == 0) {
+            info.compressedOffset = 0;
+            info.uncompressedOffset = 0;
+        } else {
+            info.compressedOffset = (unpadded[pos - 1] + 3) & ~3;
+            info.uncompressedOffset = uncompressed[pos - 1];
+        }
+
+        info.unpaddedSize = unpadded[pos] - info.compressedOffset;
+        info.uncompressedSize = uncompressed[pos] - info.uncompressedOffset;
+
+        info.compressedOffset += compressedOffset
+                                 + DecoderUtil.STREAM_HEADER_SIZE;
+        info.uncompressedOffset += uncompressedOffset;
+    }
+}
diff --git a/src/org/tukaani/xz/index/IndexEncoder.java b/src/org/tukaani/xz/index/IndexEncoder.java
new file mode 100644
index 0000000..3028802
--- /dev/null
+++ b/src/org/tukaani/xz/index/IndexEncoder.java
@@ -0,0 +1,59 @@
+/*
+ * IndexEncoder
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.index;
+
+import java.io.OutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.zip.CheckedOutputStream;
+import org.tukaani.xz.common.EncoderUtil;
+import org.tukaani.xz.XZIOException;
+
+public class IndexEncoder extends IndexBase {
+    private final ArrayList<IndexRecord> records
+            = new ArrayList<IndexRecord>();
+
+    public IndexEncoder() {
+        super(new XZIOException("XZ Stream or its Index has grown too big"));
+    }
+
+    public void add(long unpaddedSize, long uncompressedSize)
+            throws XZIOException {
+        super.add(unpaddedSize, uncompressedSize);
+        records.add(new IndexRecord(unpaddedSize, uncompressedSize));
+    }
+
+    public void encode(OutputStream out) throws IOException {
+        java.util.zip.CRC32 crc32 = new java.util.zip.CRC32();
+        CheckedOutputStream outChecked = new CheckedOutputStream(out, crc32);
+
+        // Index Indicator
+        outChecked.write(0x00);
+
+        // Number of Records
+        EncoderUtil.encodeVLI(outChecked, recordCount);
+
+        // List of Records
+        for (IndexRecord record : records) {
+            EncoderUtil.encodeVLI(outChecked, record.unpadded);
+            EncoderUtil.encodeVLI(outChecked, record.uncompressed);
+        }
+
+        // Index Padding
+        for (int i = getIndexPaddingSize(); i > 0; --i)
+            outChecked.write(0x00);
+
+        // CRC32
+        long value = crc32.getValue();
+        for (int i = 0; i < 4; ++i)
+            out.write((byte)(value >>> (i * 8)));
+    }
+}
diff --git a/src/org/tukaani/xz/index/IndexHash.java b/src/org/tukaani/xz/index/IndexHash.java
new file mode 100644
index 0000000..61725a5
--- /dev/null
+++ b/src/org/tukaani/xz/index/IndexHash.java
@@ -0,0 +1,98 @@
+/*
+ * IndexHash
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.index;
+
+import java.io.InputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.zip.CheckedInputStream;
+import org.tukaani.xz.common.DecoderUtil;
+import org.tukaani.xz.XZIOException;
+import org.tukaani.xz.CorruptedInputException;
+
+public class IndexHash extends IndexBase {
+    private org.tukaani.xz.check.Check hash;
+
+    public IndexHash() {
+        super(new CorruptedInputException());
+
+        try {
+            hash = new org.tukaani.xz.check.SHA256();
+        } catch (java.security.NoSuchAlgorithmException e) {
+            hash = new org.tukaani.xz.check.CRC32();
+        }
+    }
+
+    public void add(long unpaddedSize, long uncompressedSize)
+            throws XZIOException {
+        super.add(unpaddedSize, uncompressedSize);
+
+        ByteBuffer buf = ByteBuffer.allocate(2 * 8);
+        buf.putLong(unpaddedSize);
+        buf.putLong(uncompressedSize);
+        hash.update(buf.array());
+    }
+
+    public void validate(InputStream in) throws IOException {
+        // Index Indicator (0x00) has already been read by BlockInputStream
+        // so add 0x00 to the CRC32 here.
+        java.util.zip.CRC32 crc32 = new java.util.zip.CRC32();
+        crc32.update('\0');
+        CheckedInputStream inChecked = new CheckedInputStream(in, crc32);
+
+        // Get and validate the Number of Records field.
+        // If Block Header Size was corrupt and became Index Indicator,
+        // this error would actually be about corrupt Block Header.
+        // This is why the error message mentions both possibilities.
+        long storedRecordCount = DecoderUtil.decodeVLI(inChecked);
+        if (storedRecordCount != recordCount)
+            throw new CorruptedInputException(
+                    "XZ Block Header or the start of XZ Index is corrupt");
+
+        // Decode and hash the Index field and compare it to
+        // the hash value calculated from the decoded Blocks.
+        IndexHash stored = new IndexHash();
+        for (long i = 0; i < recordCount; ++i) {
+            long unpaddedSize = DecoderUtil.decodeVLI(inChecked);
+            long uncompressedSize = DecoderUtil.decodeVLI(inChecked);
+
+            try {
+                stored.add(unpaddedSize, uncompressedSize);
+            } catch (XZIOException e) {
+                throw new CorruptedInputException("XZ Index is corrupt");
+            }
+
+            if (stored.blocksSum > blocksSum
+                    || stored.uncompressedSum > uncompressedSum
+                    || stored.indexListSize > indexListSize)
+                throw new CorruptedInputException("XZ Index is corrupt");
+        }
+
+        if (stored.blocksSum != blocksSum
+                || stored.uncompressedSum != uncompressedSum
+                || stored.indexListSize != indexListSize
+                || !Arrays.equals(stored.hash.finish(), hash.finish()))
+            throw new CorruptedInputException("XZ Index is corrupt");
+
+        // Index Padding
+        DataInputStream inData = new DataInputStream(inChecked);
+        for (int i = getIndexPaddingSize(); i > 0; --i)
+            if (inData.readUnsignedByte() != 0x00)
+                throw new CorruptedInputException("XZ Index is corrupt");
+
+        // CRC32
+        long value = crc32.getValue();
+        for (int i = 0; i < 4; ++i)
+            if (((value >>> (i * 8)) & 0xFF) != inData.readUnsignedByte())
+                throw new CorruptedInputException("XZ Index is corrupt");
+    }
+}
diff --git a/src/org/tukaani/xz/index/IndexRecord.java b/src/org/tukaani/xz/index/IndexRecord.java
new file mode 100644
index 0000000..5f6ba0f
--- /dev/null
+++ b/src/org/tukaani/xz/index/IndexRecord.java
@@ -0,0 +1,20 @@
+/*
+ * IndexRecord
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.index;
+
+class IndexRecord {
+    final long unpadded;
+    final long uncompressed;
+
+    IndexRecord(long unpadded, long uncompressed) {
+        this.unpadded = unpadded;
+        this.uncompressed = uncompressed;
+    }
+}
diff --git a/src/org/tukaani/xz/lz/BT4.java b/src/org/tukaani/xz/lz/BT4.java
new file mode 100644
index 0000000..6c46feb
--- /dev/null
+++ b/src/org/tukaani/xz/lz/BT4.java
@@ -0,0 +1,265 @@
+/*
+ * Binary Tree match finder with 2-, 3-, and 4-byte hashing
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lz;
+
+import org.tukaani.xz.ArrayCache;
+
+final class BT4 extends LZEncoder {
+    private final Hash234 hash;
+    private final int[] tree;
+    private final Matches matches;
+    private final int depthLimit;
+
+    private final int cyclicSize;
+    private int cyclicPos = -1;
+    private int lzPos;
+
+    static int getMemoryUsage(int dictSize) {
+        return Hash234.getMemoryUsage(dictSize) + dictSize / (1024 / 8) + 10;
+    }
+
+    BT4(int dictSize, int beforeSizeMin, int readAheadMax,
+            int niceLen, int matchLenMax, int depthLimit,
+            ArrayCache arrayCache) {
+        super(dictSize, beforeSizeMin, readAheadMax, niceLen, matchLenMax,
+              arrayCache);
+
+        cyclicSize = dictSize + 1;
+        lzPos = cyclicSize;
+
+        hash = new Hash234(dictSize, arrayCache);
+        tree = arrayCache.getIntArray(cyclicSize * 2, false);
+
+        // Substracting 1 because the shortest match that this match
+        // finder can find is 2 bytes, so there's no need to reserve
+        // space for one-byte matches.
+        matches = new Matches(niceLen - 1);
+
+        this.depthLimit = depthLimit > 0 ? depthLimit : 16 + niceLen / 2;
+    }
+
+    public void putArraysToCache(ArrayCache arrayCache) {
+        arrayCache.putArray(tree);
+        hash.putArraysToCache(arrayCache);
+        super.putArraysToCache(arrayCache);
+    }
+
+    private int movePos() {
+        int avail = movePos(niceLen, 4);
+
+        if (avail != 0) {
+            if (++lzPos == Integer.MAX_VALUE) {
+                int normalizationOffset = Integer.MAX_VALUE - cyclicSize;
+                hash.normalize(normalizationOffset);
+                normalize(tree, cyclicSize * 2, normalizationOffset);
+                lzPos -= normalizationOffset;
+            }
+
+            if (++cyclicPos == cyclicSize)
+                cyclicPos = 0;
+        }
+
+        return avail;
+    }
+
+    public Matches getMatches() {
+        matches.count = 0;
+
+        int matchLenLimit = matchLenMax;
+        int niceLenLimit = niceLen;
+        int avail = movePos();
+
+        if (avail < matchLenLimit) {
+            if (avail == 0)
+                return matches;
+
+            matchLenLimit = avail;
+            if (niceLenLimit > avail)
+                niceLenLimit = avail;
+        }
+
+        hash.calcHashes(buf, readPos);
+        int delta2 = lzPos - hash.getHash2Pos();
+        int delta3 = lzPos - hash.getHash3Pos();
+        int currentMatch = hash.getHash4Pos();
+        hash.updateTables(lzPos);
+
+        int lenBest = 0;
+
+        // See if the hash from the first two bytes found a match.
+        // The hashing algorithm guarantees that if the first byte
+        // matches, also the second byte does, so there's no need to
+        // test the second byte.
+        if (delta2 < cyclicSize && buf[readPos - delta2] == buf[readPos]) {
+            lenBest = 2;
+            matches.len[0] = 2;
+            matches.dist[0] = delta2 - 1;
+            matches.count = 1;
+        }
+
+        // See if the hash from the first three bytes found a match that
+        // is different from the match possibly found by the two-byte hash.
+        // Also here the hashing algorithm guarantees that if the first byte
+        // matches, also the next two bytes do.
+        if (delta2 != delta3 && delta3 < cyclicSize
+                && buf[readPos - delta3] == buf[readPos]) {
+            lenBest = 3;
+            matches.dist[matches.count++] = delta3 - 1;
+            delta2 = delta3;
+        }
+
+        // If a match was found, see how long it is.
+        if (matches.count > 0) {
+            while (lenBest < matchLenLimit && buf[readPos + lenBest - delta2]
+                                              == buf[readPos + lenBest])
+                ++lenBest;
+
+            matches.len[matches.count - 1] = lenBest;
+
+            // Return if it is long enough (niceLen or reached the end of
+            // the dictionary).
+            if (lenBest >= niceLenLimit) {
+                skip(niceLenLimit, currentMatch);
+                return matches;
+            }
+        }
+
+        // Long enough match wasn't found so easily. Look for better matches
+        // from the binary tree.
+        if (lenBest < 3)
+            lenBest = 3;
+
+        int depth = depthLimit;
+
+        int ptr0 = (cyclicPos << 1) + 1;
+        int ptr1 = cyclicPos << 1;
+        int len0 = 0;
+        int len1 = 0;
+
+        while (true) {
+            int delta = lzPos - currentMatch;
+
+            // Return if the search depth limit has been reached or
+            // if the distance of the potential match exceeds the
+            // dictionary size.
+            if (depth-- == 0 || delta >= cyclicSize) {
+                tree[ptr0] = 0;
+                tree[ptr1] = 0;
+                return matches;
+            }
+
+            int pair = (cyclicPos - delta
+                        + (delta > cyclicPos ? cyclicSize : 0)) << 1;
+            int len = Math.min(len0, len1);
+
+            if (buf[readPos + len - delta] == buf[readPos + len]) {
+                while (++len < matchLenLimit)
+                    if (buf[readPos + len - delta] != buf[readPos + len])
+                        break;
+
+                if (len > lenBest) {
+                    lenBest = len;
+                    matches.len[matches.count] = len;
+                    matches.dist[matches.count] = delta - 1;
+                    ++matches.count;
+
+                    if (len >= niceLenLimit) {
+                        tree[ptr1] = tree[pair];
+                        tree[ptr0] = tree[pair + 1];
+                        return matches;
+                    }
+                }
+            }
+
+            if ((buf[readPos + len - delta] & 0xFF)
+                    < (buf[readPos + len] & 0xFF)) {
+                tree[ptr1] = currentMatch;
+                ptr1 = pair + 1;
+                currentMatch = tree[ptr1];
+                len1 = len;
+            } else {
+                tree[ptr0] = currentMatch;
+                ptr0 = pair;
+                currentMatch = tree[ptr0];
+                len0 = len;
+            }
+        }
+    }
+
+    private void skip(int niceLenLimit, int currentMatch) {
+        int depth = depthLimit;
+
+        int ptr0 = (cyclicPos << 1) + 1;
+        int ptr1 = cyclicPos << 1;
+        int len0 = 0;
+        int len1 = 0;
+
+        while (true) {
+            int delta = lzPos - currentMatch;
+
+            if (depth-- == 0 || delta >= cyclicSize) {
+                tree[ptr0] = 0;
+                tree[ptr1] = 0;
+                return;
+            }
+
+            int pair = (cyclicPos - delta
+                        + (delta > cyclicPos ? cyclicSize : 0)) << 1;
+            int len = Math.min(len0, len1);
+
+            if (buf[readPos + len - delta] == buf[readPos + len]) {
+                // No need to look for longer matches than niceLenLimit
+                // because we only are updating the tree, not returning
+                // matches found to the caller.
+                do {
+                    if (++len == niceLenLimit) {
+                        tree[ptr1] = tree[pair];
+                        tree[ptr0] = tree[pair + 1];
+                        return;
+                    }
+                } while (buf[readPos + len - delta] == buf[readPos + len]);
+            }
+
+            if ((buf[readPos + len - delta] & 0xFF)
+                    < (buf[readPos + len] & 0xFF)) {
+                tree[ptr1] = currentMatch;
+                ptr1 = pair + 1;
+                currentMatch = tree[ptr1];
+                len1 = len;
+            } else {
+                tree[ptr0] = currentMatch;
+                ptr0 = pair;
+                currentMatch = tree[ptr0];
+                len0 = len;
+            }
+        }
+    }
+
+    public void skip(int len) {
+        while (len-- > 0) {
+            int niceLenLimit = niceLen;
+            int avail = movePos();
+
+            if (avail < niceLenLimit) {
+                if (avail == 0)
+                    continue;
+
+                niceLenLimit = avail;
+            }
+
+            hash.calcHashes(buf, readPos);
+            int currentMatch = hash.getHash4Pos();
+            hash.updateTables(lzPos);
+
+            skip(niceLenLimit, currentMatch);
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/lz/CRC32Hash.java b/src/org/tukaani/xz/lz/CRC32Hash.java
new file mode 100644
index 0000000..2adfdbf
--- /dev/null
+++ b/src/org/tukaani/xz/lz/CRC32Hash.java
@@ -0,0 +1,35 @@
+/*
+ * CRC32Hash
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lz;
+
+/**
+ * Provides a CRC32 table using the polynomial from IEEE 802.3.
+ */
+class CRC32Hash {
+    private static final int CRC32_POLY = 0xEDB88320;
+
+    static final int[] crcTable = new int[256];
+
+    static {
+        for (int i = 0; i < 256; ++i) {
+            int r = i;
+
+            for (int j = 0; j < 8; ++j) {
+                if ((r & 1) != 0)
+                    r = (r >>> 1) ^ CRC32_POLY;
+                else
+                    r >>>= 1;
+            }
+
+            crcTable[i] = r;
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/lz/HC4.java b/src/org/tukaani/xz/lz/HC4.java
new file mode 100644
index 0000000..d2b4e84
--- /dev/null
+++ b/src/org/tukaani/xz/lz/HC4.java
@@ -0,0 +1,210 @@
+/*
+ * Hash Chain match finder with 2-, 3-, and 4-byte hashing
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lz;
+
+import org.tukaani.xz.ArrayCache;
+
+final class HC4 extends LZEncoder {
+    private final Hash234 hash;
+    private final int[] chain;
+    private final Matches matches;
+    private final int depthLimit;
+
+    private final int cyclicSize;
+    private int cyclicPos = -1;
+    private int lzPos;
+
+    /**
+     * Gets approximate memory usage of the match finder as kibibytes.
+     */
+    static int getMemoryUsage(int dictSize) {
+        return Hash234.getMemoryUsage(dictSize) + dictSize / (1024 / 4) + 10;
+    }
+
+    /**
+     * Creates a new LZEncoder with the HC4 match finder.
+     * See <code>LZEncoder.getInstance</code> for parameter descriptions.
+     */
+    HC4(int dictSize, int beforeSizeMin, int readAheadMax,
+            int niceLen, int matchLenMax, int depthLimit,
+            ArrayCache arrayCache) {
+        super(dictSize, beforeSizeMin, readAheadMax, niceLen, matchLenMax,
+              arrayCache);
+
+        hash = new Hash234(dictSize, arrayCache);
+
+        // +1 because we need dictSize bytes of history + the current byte.
+        cyclicSize = dictSize + 1;
+        chain = arrayCache.getIntArray(cyclicSize, false);
+        lzPos = cyclicSize;
+
+        // Substracting 1 because the shortest match that this match
+        // finder can find is 2 bytes, so there's no need to reserve
+        // space for one-byte matches.
+        matches = new Matches(niceLen - 1);
+
+        // Use a default depth limit if no other value was specified.
+        // The default is just something based on experimentation;
+        // it's nothing magic.
+        this.depthLimit = (depthLimit > 0) ? depthLimit : 4 + niceLen / 4;
+    }
+
+    public void putArraysToCache(ArrayCache arrayCache) {
+        arrayCache.putArray(chain);
+        hash.putArraysToCache(arrayCache);
+        super.putArraysToCache(arrayCache);
+    }
+
+    /**
+     * Moves to the next byte, checks that there is enough available space,
+     * and possibly normalizes the hash tables and the hash chain.
+     *
+     * @return      number of bytes available, including the current byte
+     */
+    private int movePos() {
+        int avail = movePos(4, 4);
+
+        if (avail != 0) {
+            if (++lzPos == Integer.MAX_VALUE) {
+                int normalizationOffset = Integer.MAX_VALUE - cyclicSize;
+                hash.normalize(normalizationOffset);
+                normalize(chain, cyclicSize, normalizationOffset);
+                lzPos -= normalizationOffset;
+            }
+
+            if (++cyclicPos == cyclicSize)
+                cyclicPos = 0;
+        }
+
+        return avail;
+    }
+
+    public Matches getMatches() {
+        matches.count = 0;
+        int matchLenLimit = matchLenMax;
+        int niceLenLimit = niceLen;
+        int avail = movePos();
+
+        if (avail < matchLenLimit) {
+            if (avail == 0)
+                return matches;
+
+            matchLenLimit = avail;
+            if (niceLenLimit > avail)
+                niceLenLimit = avail;
+        }
+
+        hash.calcHashes(buf, readPos);
+        int delta2 = lzPos - hash.getHash2Pos();
+        int delta3 = lzPos - hash.getHash3Pos();
+        int currentMatch = hash.getHash4Pos();
+        hash.updateTables(lzPos);
+
+        chain[cyclicPos] = currentMatch;
+
+        int lenBest = 0;
+
+        // See if the hash from the first two bytes found a match.
+        // The hashing algorithm guarantees that if the first byte
+        // matches, also the second byte does, so there's no need to
+        // test the second byte.
+        if (delta2 < cyclicSize && buf[readPos - delta2] == buf[readPos]) {
+            lenBest = 2;
+            matches.len[0] = 2;
+            matches.dist[0] = delta2 - 1;
+            matches.count = 1;
+        }
+
+        // See if the hash from the first three bytes found a match that
+        // is different from the match possibly found by the two-byte hash.
+        // Also here the hashing algorithm guarantees that if the first byte
+        // matches, also the next two bytes do.
+        if (delta2 != delta3 && delta3 < cyclicSize
+                && buf[readPos - delta3] == buf[readPos]) {
+            lenBest = 3;
+            matches.dist[matches.count++] = delta3 - 1;
+            delta2 = delta3;
+        }
+
+        // If a match was found, see how long it is.
+        if (matches.count > 0) {
+            while (lenBest < matchLenLimit && buf[readPos + lenBest - delta2]
+                                              == buf[readPos + lenBest])
+                ++lenBest;
+
+            matches.len[matches.count - 1] = lenBest;
+
+            // Return if it is long enough (niceLen or reached the end of
+            // the dictionary).
+            if (lenBest >= niceLenLimit)
+                return matches;
+        }
+
+        // Long enough match wasn't found so easily. Look for better matches
+        // from the hash chain.
+        if (lenBest < 3)
+            lenBest = 3;
+
+        int depth = depthLimit;
+
+        while (true) {
+            int delta = lzPos - currentMatch;
+
+            // Return if the search depth limit has been reached or
+            // if the distance of the potential match exceeds the
+            // dictionary size.
+            if (depth-- == 0 || delta >= cyclicSize)
+                return matches;
+
+            currentMatch = chain[cyclicPos - delta
+                                 + (delta > cyclicPos ? cyclicSize : 0)];
+
+            // Test the first byte and the first new byte that would give us
+            // a match that is at least one byte longer than lenBest. This
+            // too short matches get quickly skipped.
+            if (buf[readPos + lenBest - delta] == buf[readPos + lenBest]
+                    && buf[readPos - delta] == buf[readPos]) {
+                // Calculate the length of the match.
+                int len = 0;
+                while (++len < matchLenLimit)
+                    if (buf[readPos + len - delta] != buf[readPos + len])
+                        break;
+
+                // Use the match if and only if it is better than the longest
+                // match found so far.
+                if (len > lenBest) {
+                    lenBest = len;
+                    matches.len[matches.count] = len;
+                    matches.dist[matches.count] = delta - 1;
+                    ++matches.count;
+
+                    // Return if it is long enough (niceLen or reached the
+                    // end of the dictionary).
+                    if (len >= niceLenLimit)
+                        return matches;
+                }
+            }
+        }
+    }
+
+    public void skip(int len) {
+        assert len >= 0;
+
+        while (len-- > 0) {
+            if (movePos() != 0) {
+                // Update the hash chain and hash tables.
+                hash.calcHashes(buf, readPos);
+                chain[cyclicPos] = hash.getHash4Pos();
+                hash.updateTables(lzPos);
+            }
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/lz/Hash234.java b/src/org/tukaani/xz/lz/Hash234.java
new file mode 100644
index 0000000..299ec44
--- /dev/null
+++ b/src/org/tukaani/xz/lz/Hash234.java
@@ -0,0 +1,102 @@
+/*
+ * 2-, 3-, and 4-byte hashing
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lz;
+
+import org.tukaani.xz.ArrayCache;
+
+final class Hash234 extends CRC32Hash {
+    private static final int HASH_2_SIZE = 1 << 10;
+    private static final int HASH_2_MASK = HASH_2_SIZE - 1;
+
+    private static final int HASH_3_SIZE = 1 << 16;
+    private static final int HASH_3_MASK = HASH_3_SIZE - 1;
+
+    private final int hash4Mask;
+
+    private final int[] hash2Table;
+    private final int[] hash3Table;
+    private final int[] hash4Table;
+    private final int hash4Size;
+
+    private int hash2Value = 0;
+    private int hash3Value = 0;
+    private int hash4Value = 0;
+
+    static int getHash4Size(int dictSize) {
+        int h = dictSize - 1;
+        h |= h >>> 1;
+        h |= h >>> 2;
+        h |= h >>> 4;
+        h |= h >>> 8;
+        h >>>= 1;
+        h |= 0xFFFF;
+        if (h > (1 << 24))
+            h >>>= 1;
+
+        return h + 1;
+    }
+
+    static int getMemoryUsage(int dictSize) {
+        // Sizes of the hash arrays + a little extra
+        return (HASH_2_SIZE + HASH_3_SIZE + getHash4Size(dictSize))
+               / (1024 / 4) + 4;
+    }
+
+    Hash234(int dictSize, ArrayCache arrayCache) {
+        hash2Table = arrayCache.getIntArray(HASH_2_SIZE, true);
+        hash3Table = arrayCache.getIntArray(HASH_3_SIZE, true);
+
+        hash4Size = getHash4Size(dictSize);
+        hash4Table = arrayCache.getIntArray(hash4Size, true);
+        hash4Mask = hash4Size - 1;
+    }
+
+    void putArraysToCache(ArrayCache arrayCache) {
+        arrayCache.putArray(hash4Table);
+        arrayCache.putArray(hash3Table);
+        arrayCache.putArray(hash2Table);
+    }
+
+    void calcHashes(byte[] buf, int off) {
+        int temp = crcTable[buf[off] & 0xFF] ^ (buf[off + 1] & 0xFF);
+        hash2Value = temp & HASH_2_MASK;
+
+        temp ^= (buf[off + 2] & 0xFF) << 8;
+        hash3Value = temp & HASH_3_MASK;
+
+        temp ^= crcTable[buf[off + 3] & 0xFF] << 5;
+        hash4Value = temp & hash4Mask;
+    }
+
+    int getHash2Pos() {
+        return hash2Table[hash2Value];
+    }
+
+    int getHash3Pos() {
+        return hash3Table[hash3Value];
+    }
+
+    int getHash4Pos() {
+        return hash4Table[hash4Value];
+    }
+
+    void updateTables(int pos) {
+        hash2Table[hash2Value] = pos;
+        hash3Table[hash3Value] = pos;
+        hash4Table[hash4Value] = pos;
+    }
+
+    void normalize(int normalizeOffset) {
+        LZEncoder.normalize(hash2Table, HASH_2_SIZE, normalizeOffset);
+        LZEncoder.normalize(hash3Table, HASH_3_SIZE, normalizeOffset);
+        LZEncoder.normalize(hash4Table, hash4Size, normalizeOffset);
+    }
+}
diff --git a/src/org/tukaani/xz/lz/LZDecoder.java b/src/org/tukaani/xz/lz/LZDecoder.java
new file mode 100644
index 0000000..85b2ca1
--- /dev/null
+++ b/src/org/tukaani/xz/lz/LZDecoder.java
@@ -0,0 +1,133 @@
+/*
+ * LZDecoder
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lz;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import org.tukaani.xz.ArrayCache;
+import org.tukaani.xz.CorruptedInputException;
+
+public final class LZDecoder {
+    private final byte[] buf;
+    private final int bufSize; // To avoid buf.length with an array-cached buf.
+    private int start = 0;
+    private int pos = 0;
+    private int full = 0;
+    private int limit = 0;
+    private int pendingLen = 0;
+    private int pendingDist = 0;
+
+    public LZDecoder(int dictSize, byte[] presetDict, ArrayCache arrayCache) {
+        bufSize = dictSize;
+        buf = arrayCache.getByteArray(bufSize, false);
+
+        if (presetDict != null) {
+            pos = Math.min(presetDict.length, dictSize);
+            full = pos;
+            start = pos;
+            System.arraycopy(presetDict, presetDict.length - pos, buf, 0, pos);
+        }
+    }
+
+    public void putArraysToCache(ArrayCache arrayCache) {
+        arrayCache.putArray(buf);
+    }
+
+    public void reset() {
+        start = 0;
+        pos = 0;
+        full = 0;
+        limit = 0;
+        buf[bufSize - 1] = 0x00;
+    }
+
+    public void setLimit(int outMax) {
+        if (bufSize - pos <= outMax)
+            limit = bufSize;
+        else
+            limit = pos + outMax;
+    }
+
+    public boolean hasSpace() {
+        return pos < limit;
+    }
+
+    public boolean hasPending() {
+        return pendingLen > 0;
+    }
+
+    public int getPos() {
+        return pos;
+    }
+
+    public int getByte(int dist) {
+        int offset = pos - dist - 1;
+        if (dist >= pos)
+            offset += bufSize;
+
+        return buf[offset] & 0xFF;
+    }
+
+    public void putByte(byte b) {
+        buf[pos++] = b;
+
+        if (full < pos)
+            full = pos;
+    }
+
+    public void repeat(int dist, int len) throws IOException {
+        if (dist < 0 || dist >= full)
+            throw new CorruptedInputException();
+
+        int left = Math.min(limit - pos, len);
+        pendingLen = len - left;
+        pendingDist = dist;
+
+        int back = pos - dist - 1;
+        if (dist >= pos)
+            back += bufSize;
+
+        do {
+            buf[pos++] = buf[back++];
+            if (back == bufSize)
+                back = 0;
+        } while (--left > 0);
+
+        if (full < pos)
+            full = pos;
+    }
+
+    public void repeatPending() throws IOException {
+        if (pendingLen > 0)
+            repeat(pendingDist, pendingLen);
+    }
+
+    public void copyUncompressed(DataInputStream inData, int len)
+            throws IOException {
+        int copySize = Math.min(bufSize - pos, len);
+        inData.readFully(buf, pos, copySize);
+        pos += copySize;
+
+        if (full < pos)
+            full = pos;
+    }
+
+    public int flush(byte[] out, int outOff) {
+        int copySize = pos - start;
+        if (pos == bufSize)
+            pos = 0;
+
+        System.arraycopy(buf, start, out, outOff, copySize);
+        start = pos;
+
+        return copySize;
+    }
+}
diff --git a/src/org/tukaani/xz/lz/LZEncoder.java b/src/org/tukaani/xz/lz/LZEncoder.java
new file mode 100644
index 0000000..0f13029
--- /dev/null
+++ b/src/org/tukaani/xz/lz/LZEncoder.java
@@ -0,0 +1,428 @@
+/*
+ * LZEncoder
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lz;
+
+import java.io.OutputStream;
+import java.io.IOException;
+import org.tukaani.xz.ArrayCache;
+
+public abstract class LZEncoder {
+    public static final int MF_HC4 = 0x04;
+    public static final int MF_BT4 = 0x14;
+
+    /**
+     * Number of bytes to keep available before the current byte
+     * when moving the LZ window.
+     */
+    private final int keepSizeBefore;
+
+    /**
+     * Number of bytes that must be available, the current byte included,
+     * to make hasEnoughData return true. Flushing and finishing are
+     * naturally exceptions to this since there cannot be any data after
+     * the end of the uncompressed input.
+     */
+    private final int keepSizeAfter;
+
+    final int matchLenMax;
+    final int niceLen;
+
+    final byte[] buf;
+    final int bufSize; // To avoid buf.length with an array-cached buf.
+
+    int readPos = -1;
+    private int readLimit = -1;
+    private boolean finishing = false;
+    private int writePos = 0;
+    private int pendingSize = 0;
+
+    static void normalize(int[] positions, int positionsCount,
+                          int normalizationOffset) {
+        for (int i = 0; i < positionsCount; ++i) {
+            if (positions[i] <= normalizationOffset)
+                positions[i] = 0;
+            else
+                positions[i] -= normalizationOffset;
+        }
+    }
+
+    /**
+     * Gets the size of the LZ window buffer that needs to be allocated.
+     */
+    private static int getBufSize(
+            int dictSize, int extraSizeBefore, int extraSizeAfter,
+            int matchLenMax) {
+        int keepSizeBefore = extraSizeBefore + dictSize;
+        int keepSizeAfter = extraSizeAfter + matchLenMax;
+        int reserveSize = Math.min(dictSize / 2 + (256 << 10), 512 << 20);
+        return keepSizeBefore + keepSizeAfter + reserveSize;
+    }
+
+    /**
+     * Gets approximate memory usage of the LZEncoder base structure and
+     * the match finder as kibibytes.
+     */
+    public static int getMemoryUsage(
+            int dictSize, int extraSizeBefore, int extraSizeAfter,
+            int matchLenMax, int mf) {
+        // Buffer size + a little extra
+        int m = getBufSize(dictSize, extraSizeBefore, extraSizeAfter,
+                           matchLenMax) / 1024 + 10;
+
+        switch (mf) {
+            case MF_HC4:
+                m += HC4.getMemoryUsage(dictSize);
+                break;
+
+            case MF_BT4:
+                m += BT4.getMemoryUsage(dictSize);
+                break;
+
+            default:
+                throw new IllegalArgumentException();
+        }
+
+        return m;
+    }
+
+    /**
+     * Creates a new LZEncoder.
+     * <p>
+     * @param       dictSize    dictionary size
+     *
+     * @param       extraSizeBefore
+     *                          number of bytes to keep available in the
+     *                          history in addition to dictSize
+     *
+     * @param       extraSizeAfter
+     *                          number of bytes that must be available
+     *                          after current position + matchLenMax
+     *
+     * @param       niceLen     if a match of at least <code>niceLen</code>
+     *                          bytes is found, be happy with it and don't
+     *                          stop looking for longer matches
+     *
+     * @param       matchLenMax don't test for matches longer than
+     *                          <code>matchLenMax</code> bytes
+     *
+     * @param       mf          match finder ID
+     *
+     * @param       depthLimit  match finder search depth limit
+     */
+    public static LZEncoder getInstance(
+            int dictSize, int extraSizeBefore, int extraSizeAfter,
+            int niceLen, int matchLenMax, int mf, int depthLimit,
+            ArrayCache arrayCache) {
+        switch (mf) {
+            case MF_HC4:
+                return new HC4(dictSize, extraSizeBefore, extraSizeAfter,
+                               niceLen, matchLenMax, depthLimit, arrayCache);
+
+            case MF_BT4:
+                return new BT4(dictSize, extraSizeBefore, extraSizeAfter,
+                               niceLen, matchLenMax, depthLimit, arrayCache);
+        }
+
+        throw new IllegalArgumentException();
+    }
+
+    /**
+     * Creates a new LZEncoder. See <code>getInstance</code>.
+     */
+    LZEncoder(int dictSize, int extraSizeBefore, int extraSizeAfter,
+              int niceLen, int matchLenMax, ArrayCache arrayCache) {
+        bufSize = getBufSize(dictSize, extraSizeBefore, extraSizeAfter,
+                             matchLenMax);
+        buf = arrayCache.getByteArray(bufSize, false);
+
+        keepSizeBefore = extraSizeBefore + dictSize;
+        keepSizeAfter = extraSizeAfter + matchLenMax;
+
+        this.matchLenMax = matchLenMax;
+        this.niceLen = niceLen;
+    }
+
+    public void putArraysToCache(ArrayCache arrayCache) {
+        arrayCache.putArray(buf);
+    }
+
+    /**
+     * Sets a preset dictionary. If a preset dictionary is wanted, this
+     * function must be called immediately after creating the LZEncoder
+     * before any data has been encoded.
+     */
+    public void setPresetDict(int dictSize, byte[] presetDict) {
+        assert !isStarted();
+        assert writePos == 0;
+
+        if (presetDict != null) {
+            // If the preset dictionary buffer is bigger than the dictionary
+            // size, copy only the tail of the preset dictionary.
+            int copySize = Math.min(presetDict.length, dictSize);
+            int offset = presetDict.length - copySize;
+            System.arraycopy(presetDict, offset, buf, 0, copySize);
+            writePos += copySize;
+            skip(copySize);
+        }
+    }
+
+    /**
+     * Moves data from the end of the buffer to the beginning, discarding
+     * old data and making space for new input.
+     */
+    private void moveWindow() {
+        // Align the move to a multiple of 16 bytes. LZMA2 needs this
+        // because it uses the lowest bits from readPos to get the
+        // alignment of the uncompressed data.
+        int moveOffset = (readPos + 1 - keepSizeBefore) & ~15;
+        int moveSize = writePos - moveOffset;
+        System.arraycopy(buf, moveOffset, buf, 0, moveSize);
+
+        readPos -= moveOffset;
+        readLimit -= moveOffset;
+        writePos -= moveOffset;
+    }
+
+    /**
+     * Copies new data into the LZEncoder's buffer.
+     */
+    public int fillWindow(byte[] in, int off, int len) {
+        assert !finishing;
+
+        // Move the sliding window if needed.
+        if (readPos >= bufSize - keepSizeAfter)
+            moveWindow();
+
+        // Try to fill the dictionary buffer. If it becomes full,
+        // some of the input bytes may be left unused.
+        if (len > bufSize - writePos)
+            len = bufSize - writePos;
+
+        System.arraycopy(in, off, buf, writePos, len);
+        writePos += len;
+
+        // Set the new readLimit but only if there's enough data to allow
+        // encoding of at least one more byte.
+        if (writePos >= keepSizeAfter)
+            readLimit = writePos - keepSizeAfter;
+
+        processPendingBytes();
+
+        // Tell the caller how much input we actually copied into
+        // the dictionary.
+        return len;
+    }
+
+    /**
+     * Process pending bytes remaining from preset dictionary initialization
+     * or encoder flush operation.
+     */
+    private void processPendingBytes() {
+        // After flushing or setting a preset dictionary there will be
+        // pending data that hasn't been ran through the match finder yet.
+        // Run it through the match finder now if there is enough new data
+        // available (readPos < readLimit) that the encoder may encode at
+        // least one more input byte. This way we don't waste any time
+        // looping in the match finder (and marking the same bytes as
+        // pending again) if the application provides very little new data
+        // per write call.
+        if (pendingSize > 0 && readPos < readLimit) {
+            readPos -= pendingSize;
+            int oldPendingSize = pendingSize;
+            pendingSize = 0;
+            skip(oldPendingSize);
+            assert pendingSize < oldPendingSize;
+        }
+    }
+
+    /**
+     * Returns true if at least one byte has already been run through
+     * the match finder.
+     */
+    public boolean isStarted() {
+        return readPos != -1;
+    }
+
+    /**
+     * Marks that all the input needs to be made available in
+     * the encoded output.
+     */
+    public void setFlushing() {
+        readLimit = writePos - 1;
+        processPendingBytes();
+    }
+
+    /**
+     * Marks that there is no more input remaining. The read position
+     * can be advanced until the end of the data.
+     */
+    public void setFinishing() {
+        readLimit = writePos - 1;
+        finishing = true;
+        processPendingBytes();
+    }
+
+    /**
+     * Tests if there is enough input available to let the caller encode
+     * at least one more byte.
+     */
+    public boolean hasEnoughData(int alreadyReadLen) {
+        return readPos - alreadyReadLen < readLimit;
+    }
+
+    public void copyUncompressed(OutputStream out, int backward, int len)
+            throws IOException {
+        out.write(buf, readPos + 1 - backward, len);
+    }
+
+    /**
+     * Get the number of bytes available, including the current byte.
+     * <p>
+     * Note that the result is undefined if <code>getMatches</code> or
+     * <code>skip</code> hasn't been called yet and no preset dictionary
+     * is being used.
+     */
+    public int getAvail() {
+        assert isStarted();
+        return writePos - readPos;
+    }
+
+    /**
+     * Gets the lowest four bits of the absolute offset of the current byte.
+     * Bits other than the lowest four are undefined.
+     */
+    public int getPos() {
+        return readPos;
+    }
+
+    /**
+     * Gets the byte from the given backward offset.
+     * <p>
+     * The current byte is at <code>0</code>, the previous byte
+     * at <code>1</code> etc. To get a byte at zero-based distance,
+     * use <code>getByte(dist + 1)<code>.
+     * <p>
+     * This function is equivalent to <code>getByte(0, backward)</code>.
+     */
+    public int getByte(int backward) {
+        return buf[readPos - backward] & 0xFF;
+    }
+
+    /**
+     * Gets the byte from the given forward minus backward offset.
+     * The forward offset is added to the current position. This lets
+     * one read bytes ahead of the current byte.
+     */
+    public int getByte(int forward, int backward) {
+        return buf[readPos + forward - backward] & 0xFF;
+    }
+
+    /**
+     * Get the length of a match at the given distance.
+     *
+     * @param       dist        zero-based distance of the match to test
+     * @param       lenLimit    don't test for a match longer than this
+     *
+     * @return      length of the match; it is in the range [0, lenLimit]
+     */
+    public int getMatchLen(int dist, int lenLimit) {
+        int backPos = readPos - dist - 1;
+        int len = 0;
+
+        while (len < lenLimit && buf[readPos + len] == buf[backPos + len])
+            ++len;
+
+        return len;
+    }
+
+    /**
+     * Get the length of a match at the given distance and forward offset.
+     *
+     * @param       forward     forward offset
+     * @param       dist        zero-based distance of the match to test
+     * @param       lenLimit    don't test for a match longer than this
+     *
+     * @return      length of the match; it is in the range [0, lenLimit]
+     */
+    public int getMatchLen(int forward, int dist, int lenLimit) {
+        int curPos = readPos + forward;
+        int backPos = curPos - dist - 1;
+        int len = 0;
+
+        while (len < lenLimit && buf[curPos + len] == buf[backPos + len])
+            ++len;
+
+        return len;
+    }
+
+    /**
+     * Verifies that the matches returned by the match finder are valid.
+     * This is meant to be used in an assert statement. This is totally
+     * useless for actual encoding since match finder's results should
+     * naturally always be valid if it isn't broken.
+     *
+     * @param       matches     return value from <code>getMatches</code>
+     *
+     * @return      true if matches are valid, false if match finder is broken
+     */
+    public boolean verifyMatches(Matches matches) {
+        int lenLimit = Math.min(getAvail(), matchLenMax);
+
+        for (int i = 0; i < matches.count; ++i)
+            if (getMatchLen(matches.dist[i], lenLimit) != matches.len[i])
+                return false;
+
+        return true;
+    }
+
+    /**
+     * Moves to the next byte, checks if there is enough input available,
+     * and returns the amount of input available.
+     *
+     * @param       requiredForFlushing
+     *                          minimum number of available bytes when
+     *                          flushing; encoding may be continued with
+     *                          new input after flushing
+     * @param       requiredForFinishing
+     *                          minimum number of available bytes when
+     *                          finishing; encoding must not be continued
+     *                          after finishing or the match finder state
+     *                          may be corrupt
+     *
+     * @return      the number of bytes available or zero if there
+     *              is not enough input available
+     */
+    int movePos(int requiredForFlushing, int requiredForFinishing) {
+        assert requiredForFlushing >= requiredForFinishing;
+
+        ++readPos;
+        int avail = writePos - readPos;
+
+        if (avail < requiredForFlushing) {
+            if (avail < requiredForFinishing || !finishing) {
+                ++pendingSize;
+                avail = 0;
+            }
+        }
+
+        return avail;
+    }
+
+    /**
+     * Runs match finder for the next byte and returns the matches found.
+     */
+    public abstract Matches getMatches();
+
+    /**
+     * Skips the given number of bytes in the match finder.
+     */
+    public abstract void skip(int len);
+}
diff --git a/src/org/tukaani/xz/lz/Matches.java b/src/org/tukaani/xz/lz/Matches.java
new file mode 100644
index 0000000..2fbee11
--- /dev/null
+++ b/src/org/tukaani/xz/lz/Matches.java
@@ -0,0 +1,22 @@
+/*
+ * Matches
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lz;
+
+public final class Matches {
+    public final int[] len;
+    public final int[] dist;
+    public int count = 0;
+
+    Matches(int countMax) {
+        len = new int[countMax];
+        dist = new int[countMax];
+    }
+}
diff --git a/src/org/tukaani/xz/lzma/LZMACoder.java b/src/org/tukaani/xz/lzma/LZMACoder.java
new file mode 100644
index 0000000..c31c9a6
--- /dev/null
+++ b/src/org/tukaani/xz/lzma/LZMACoder.java
@@ -0,0 +1,140 @@
+/*
+ * LZMACoder
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lzma;
+
+import org.tukaani.xz.rangecoder.RangeCoder;
+
+abstract class LZMACoder {
+    static final int POS_STATES_MAX = 1 << 4;
+
+    static final int MATCH_LEN_MIN = 2;
+    static final int MATCH_LEN_MAX = MATCH_LEN_MIN + LengthCoder.LOW_SYMBOLS
+                                     + LengthCoder.MID_SYMBOLS
+                                     + LengthCoder.HIGH_SYMBOLS - 1;
+
+    static final int DIST_STATES = 4;
+    static final int DIST_SLOTS = 1 << 6;
+    static final int DIST_MODEL_START = 4;
+    static final int DIST_MODEL_END = 14;
+    static final int FULL_DISTANCES = 1 << (DIST_MODEL_END / 2);
+
+    static final int ALIGN_BITS = 4;
+    static final int ALIGN_SIZE = 1 << ALIGN_BITS;
+    static final int ALIGN_MASK = ALIGN_SIZE - 1;
+
+    static final int REPS = 4;
+
+    final int posMask;
+
+    final int[] reps = new int[REPS];
+    final State state = new State();
+
+    final short[][] isMatch = new short[State.STATES][POS_STATES_MAX];
+    final short[] isRep = new short[State.STATES];
+    final short[] isRep0 = new short[State.STATES];
+    final short[] isRep1 = new short[State.STATES];
+    final short[] isRep2 = new short[State.STATES];
+    final short[][] isRep0Long = new short[State.STATES][POS_STATES_MAX];
+    final short[][] distSlots = new short[DIST_STATES][DIST_SLOTS];
+    final short[][] distSpecial = { new short[2], new short[2],
+                                    new short[4], new short[4],
+                                    new short[8], new short[8],
+                                    new short[16], new short[16],
+                                    new short[32], new short[32] };
+    final short[] distAlign = new short[ALIGN_SIZE];
+
+    static final int getDistState(int len) {
+        return len < DIST_STATES + MATCH_LEN_MIN
+               ? len - MATCH_LEN_MIN
+               : DIST_STATES - 1;
+    }
+
+    LZMACoder(int pb) {
+        posMask = (1 << pb) - 1;
+    }
+
+    void reset() {
+        reps[0] = 0;
+        reps[1] = 0;
+        reps[2] = 0;
+        reps[3] = 0;
+        state.reset();
+
+        for (int i = 0; i < isMatch.length; ++i)
+            RangeCoder.initProbs(isMatch[i]);
+
+        RangeCoder.initProbs(isRep);
+        RangeCoder.initProbs(isRep0);
+        RangeCoder.initProbs(isRep1);
+        RangeCoder.initProbs(isRep2);
+
+        for (int i = 0; i < isRep0Long.length; ++i)
+            RangeCoder.initProbs(isRep0Long[i]);
+
+        for (int i = 0; i < distSlots.length; ++i)
+            RangeCoder.initProbs(distSlots[i]);
+
+        for (int i = 0; i < distSpecial.length; ++i)
+            RangeCoder.initProbs(distSpecial[i]);
+
+        RangeCoder.initProbs(distAlign);
+    }
+
+
+    abstract class LiteralCoder {
+        private final int lc;
+        private final int literalPosMask;
+
+        LiteralCoder(int lc, int lp) {
+            this.lc = lc;
+            this.literalPosMask = (1 << lp) - 1;
+        }
+
+        final int getSubcoderIndex(int prevByte, int pos) {
+            int low = prevByte >> (8 - lc);
+            int high = (pos & literalPosMask) << lc;
+            return low + high;
+        }
+
+
+        abstract class LiteralSubcoder {
+            final short[] probs = new short[0x300];
+
+            void reset() {
+                RangeCoder.initProbs(probs);
+            }
+        }
+    }
+
+
+    abstract class LengthCoder {
+        static final int LOW_SYMBOLS = 1 << 3;
+        static final int MID_SYMBOLS = 1 << 3;
+        static final int HIGH_SYMBOLS = 1 << 8;
+
+        final short[] choice = new short[2];
+        final short[][] low = new short[POS_STATES_MAX][LOW_SYMBOLS];
+        final short[][] mid = new short[POS_STATES_MAX][MID_SYMBOLS];
+        final short[] high = new short[HIGH_SYMBOLS];
+
+        void reset() {
+            RangeCoder.initProbs(choice);
+
+            for (int i = 0; i < low.length; ++i)
+                RangeCoder.initProbs(low[i]);
+
+            for (int i = 0; i < low.length; ++i)
+                RangeCoder.initProbs(mid[i]);
+
+            RangeCoder.initProbs(high);
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/lzma/LZMADecoder.java b/src/org/tukaani/xz/lzma/LZMADecoder.java
new file mode 100644
index 0000000..ccf1960
--- /dev/null
+++ b/src/org/tukaani/xz/lzma/LZMADecoder.java
@@ -0,0 +1,199 @@
+/*
+ * LZMADecoder
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lzma;
+
+import java.io.IOException;
+import org.tukaani.xz.lz.LZDecoder;
+import org.tukaani.xz.rangecoder.RangeDecoder;
+
+public final class LZMADecoder extends LZMACoder {
+    private final LZDecoder lz;
+    private final RangeDecoder rc;
+    private final LiteralDecoder literalDecoder;
+    private final LengthDecoder matchLenDecoder = new LengthDecoder();
+    private final LengthDecoder repLenDecoder = new LengthDecoder();
+
+    public LZMADecoder(LZDecoder lz, RangeDecoder rc, int lc, int lp, int pb) {
+        super(pb);
+        this.lz = lz;
+        this.rc = rc;
+        this.literalDecoder = new LiteralDecoder(lc, lp);
+        reset();
+    }
+
+    public void reset() {
+        super.reset();
+        literalDecoder.reset();
+        matchLenDecoder.reset();
+        repLenDecoder.reset();
+    }
+
+    /**
+     * Returns true if LZMA end marker was detected. It is encoded as
+     * the maximum match distance which with signed ints becomes -1. This
+     * function is needed only for LZMA1. LZMA2 doesn't use the end marker
+     * in the LZMA layer.
+     */
+    public boolean endMarkerDetected() {
+        return reps[0] == -1;
+    }
+
+    public void decode() throws IOException {
+        lz.repeatPending();
+
+        while (lz.hasSpace()) {
+            int posState = lz.getPos() & posMask;
+
+            if (rc.decodeBit(isMatch[state.get()], posState) == 0) {
+                literalDecoder.decode();
+            } else {
+                int len = rc.decodeBit(isRep, state.get()) == 0
+                          ? decodeMatch(posState)
+                          : decodeRepMatch(posState);
+
+                // NOTE: With LZMA1 streams that have the end marker,
+                // this will throw CorruptedInputException. LZMAInputStream
+                // handles it specially.
+                lz.repeat(reps[0], len);
+            }
+        }
+
+        rc.normalize();
+    }
+
+    private int decodeMatch(int posState) throws IOException {
+        state.updateMatch();
+
+        reps[3] = reps[2];
+        reps[2] = reps[1];
+        reps[1] = reps[0];
+
+        int len = matchLenDecoder.decode(posState);
+        int distSlot = rc.decodeBitTree(distSlots[getDistState(len)]);
+
+        if (distSlot < DIST_MODEL_START) {
+            reps[0] = distSlot;
+        } else {
+            int limit = (distSlot >> 1) - 1;
+            reps[0] = (2 | (distSlot & 1)) << limit;
+
+            if (distSlot < DIST_MODEL_END) {
+                reps[0] |= rc.decodeReverseBitTree(
+                        distSpecial[distSlot - DIST_MODEL_START]);
+            } else {
+                reps[0] |= rc.decodeDirectBits(limit - ALIGN_BITS)
+                           << ALIGN_BITS;
+                reps[0] |= rc.decodeReverseBitTree(distAlign);
+            }
+        }
+
+        return len;
+    }
+
+    private int decodeRepMatch(int posState) throws IOException {
+        if (rc.decodeBit(isRep0, state.get()) == 0) {
+            if (rc.decodeBit(isRep0Long[state.get()], posState) == 0) {
+                state.updateShortRep();
+                return 1;
+            }
+        } else {
+            int tmp;
+
+            if (rc.decodeBit(isRep1, state.get()) == 0) {
+                tmp = reps[1];
+            } else {
+                if (rc.decodeBit(isRep2, state.get()) == 0) {
+                    tmp = reps[2];
+                } else {
+                    tmp = reps[3];
+                    reps[3] = reps[2];
+                }
+
+                reps[2] = reps[1];
+            }
+
+            reps[1] = reps[0];
+            reps[0] = tmp;
+        }
+
+        state.updateLongRep();
+
+        return repLenDecoder.decode(posState);
+    }
+
+
+    private class LiteralDecoder extends LiteralCoder {
+        private final LiteralSubdecoder[] subdecoders;
+
+        LiteralDecoder(int lc, int lp) {
+            super(lc, lp);
+
+            subdecoders = new LiteralSubdecoder[1 << (lc + lp)];
+            for (int i = 0; i < subdecoders.length; ++i)
+                subdecoders[i] = new LiteralSubdecoder();
+        }
+
+        void reset() {
+            for (int i = 0; i < subdecoders.length; ++i)
+                subdecoders[i].reset();
+        }
+
+        void decode() throws IOException {
+            int i = getSubcoderIndex(lz.getByte(0), lz.getPos());
+            subdecoders[i].decode();
+        }
+
+
+        private class LiteralSubdecoder extends LiteralSubcoder {
+            void decode() throws IOException {
+                int symbol = 1;
+
+                if (state.isLiteral()) {
+                    do {
+                        symbol = (symbol << 1) | rc.decodeBit(probs, symbol);
+                    } while (symbol < 0x100);
+
+                } else {
+                    int matchByte = lz.getByte(reps[0]);
+                    int offset = 0x100;
+                    int matchBit;
+                    int bit;
+
+                    do {
+                        matchByte <<= 1;
+                        matchBit = matchByte & offset;
+                        bit = rc.decodeBit(probs, offset + matchBit + symbol);
+                        symbol = (symbol << 1) | bit;
+                        offset &= (0 - bit) ^ ~matchBit;
+                    } while (symbol < 0x100);
+                }
+
+                lz.putByte((byte)symbol);
+                state.updateLiteral();
+            }
+        }
+    }
+
+
+    private class LengthDecoder extends LengthCoder {
+        int decode(int posState) throws IOException {
+            if (rc.decodeBit(choice, 0) == 0)
+                return rc.decodeBitTree(low[posState]) + MATCH_LEN_MIN;
+
+            if (rc.decodeBit(choice, 1) == 0)
+                return rc.decodeBitTree(mid[posState])
+                       + MATCH_LEN_MIN + LOW_SYMBOLS;
+
+            return rc.decodeBitTree(high)
+                   + MATCH_LEN_MIN + LOW_SYMBOLS + MID_SYMBOLS;
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/lzma/LZMAEncoder.java b/src/org/tukaani/xz/lzma/LZMAEncoder.java
new file mode 100644
index 0000000..02d5172
--- /dev/null
+++ b/src/org/tukaani/xz/lzma/LZMAEncoder.java
@@ -0,0 +1,750 @@
+/*
+ * LZMAEncoder
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lzma;
+
+import java.io.IOException;
+import org.tukaani.xz.ArrayCache;
+import org.tukaani.xz.lz.LZEncoder;
+import org.tukaani.xz.lz.Matches;
+import org.tukaani.xz.rangecoder.RangeEncoder;
+
+public abstract class LZMAEncoder extends LZMACoder {
+    public static final int MODE_FAST = 1;
+    public static final int MODE_NORMAL = 2;
+
+    /**
+     * LZMA2 chunk is considered full when its uncompressed size exceeds
+     * <code>LZMA2_UNCOMPRESSED_LIMIT</code>.
+     * <p>
+     * A compressed LZMA2 chunk can hold 2 MiB of uncompressed data.
+     * A single LZMA symbol may indicate up to MATCH_LEN_MAX bytes
+     * of data, so the LZMA2 chunk is considered full when there is
+     * less space than MATCH_LEN_MAX bytes.
+     */
+    private static final int LZMA2_UNCOMPRESSED_LIMIT
+            = (2 << 20) - MATCH_LEN_MAX;
+
+    /**
+     * LZMA2 chunk is considered full when its compressed size exceeds
+     * <code>LZMA2_COMPRESSED_LIMIT</code>.
+     * <p>
+     * The maximum compressed size of a LZMA2 chunk is 64 KiB.
+     * A single LZMA symbol might use 20 bytes of space even though
+     * it usually takes just one byte or so. Two more bytes are needed
+     * for LZMA2 uncompressed chunks (see LZMA2OutputStream.writeChunk).
+     * Leave a little safety margin and use 26 bytes.
+     */
+    private static final int LZMA2_COMPRESSED_LIMIT = (64 << 10) - 26;
+
+    private static final int DIST_PRICE_UPDATE_INTERVAL = FULL_DISTANCES;
+    private static final int ALIGN_PRICE_UPDATE_INTERVAL = ALIGN_SIZE;
+
+    private final RangeEncoder rc;
+    final LZEncoder lz;
+    final LiteralEncoder literalEncoder;
+    final LengthEncoder matchLenEncoder;
+    final LengthEncoder repLenEncoder;
+    final int niceLen;
+
+    private int distPriceCount = 0;
+    private int alignPriceCount = 0;
+
+    private final int distSlotPricesSize;
+    private final int[][] distSlotPrices;
+    private final int[][] fullDistPrices
+            = new int[DIST_STATES][FULL_DISTANCES];
+    private final int[] alignPrices = new int[ALIGN_SIZE];
+
+    int back = 0;
+    int readAhead = -1;
+    private int uncompressedSize = 0;
+
+    public static int getMemoryUsage(int mode, int dictSize,
+                                     int extraSizeBefore, int mf) {
+        int m = 80;
+
+        switch (mode) {
+            case MODE_FAST:
+                m += LZMAEncoderFast.getMemoryUsage(
+                        dictSize, extraSizeBefore, mf);
+                break;
+
+            case MODE_NORMAL:
+                m += LZMAEncoderNormal.getMemoryUsage(
+                        dictSize, extraSizeBefore, mf);
+                break;
+
+            default:
+                throw new IllegalArgumentException();
+        }
+
+        return m;
+    }
+
+    public static LZMAEncoder getInstance(
+                RangeEncoder rc, int lc, int lp, int pb, int mode,
+                int dictSize, int extraSizeBefore,
+                int niceLen, int mf, int depthLimit,
+                ArrayCache arrayCache) {
+        switch (mode) {
+            case MODE_FAST:
+                return new LZMAEncoderFast(rc, lc, lp, pb,
+                                           dictSize, extraSizeBefore,
+                                           niceLen, mf, depthLimit,
+                                           arrayCache);
+
+            case MODE_NORMAL:
+                return new LZMAEncoderNormal(rc, lc, lp, pb,
+                                             dictSize, extraSizeBefore,
+                                             niceLen, mf, depthLimit,
+                                             arrayCache);
+        }
+
+        throw new IllegalArgumentException();
+    }
+
+    public void putArraysToCache(ArrayCache arrayCache) {
+        lz.putArraysToCache(arrayCache);
+    }
+
+    /**
+     * Gets an integer [0, 63] matching the highest two bits of an integer.
+     * This is like bit scan reverse (BSR) on x86 except that this also
+     * cares about the second highest bit.
+     */
+    public static int getDistSlot(int dist) {
+        if (dist <= DIST_MODEL_START && dist >= 0)
+            return dist;
+
+        int n = dist;
+        int i = 31;
+
+        if ((n & 0xFFFF0000) == 0) {
+            n <<= 16;
+            i = 15;
+        }
+
+        if ((n & 0xFF000000) == 0) {
+            n <<= 8;
+            i -= 8;
+        }
+
+        if ((n & 0xF0000000) == 0) {
+            n <<= 4;
+            i -= 4;
+        }
+
+        if ((n & 0xC0000000) == 0) {
+            n <<= 2;
+            i -= 2;
+        }
+
+        if ((n & 0x80000000) == 0)
+            --i;
+
+        return (i << 1) + ((dist >>> (i - 1)) & 1);
+    }
+
+    /**
+     * Gets the next LZMA symbol.
+     * <p>
+     * There are three types of symbols: literal (a single byte),
+     * repeated match, and normal match. The symbol is indicated
+     * by the return value and by the variable <code>back</code>.
+     * <p>
+     * Literal: <code>back == -1</code> and return value is <code>1</code>.
+     * The literal itself needs to be read from <code>lz</code> separately.
+     * <p>
+     * Repeated match: <code>back</code> is in the range [0, 3] and
+     * the return value is the length of the repeated match.
+     * <p>
+     * Normal match: <code>back - REPS<code> (<code>back - 4</code>)
+     * is the distance of the match and the return value is the length
+     * of the match.
+     */
+    abstract int getNextSymbol();
+
+    LZMAEncoder(RangeEncoder rc, LZEncoder lz,
+                int lc, int lp, int pb, int dictSize, int niceLen) {
+        super(pb);
+        this.rc = rc;
+        this.lz = lz;
+        this.niceLen = niceLen;
+
+        literalEncoder = new LiteralEncoder(lc, lp);
+        matchLenEncoder = new LengthEncoder(pb, niceLen);
+        repLenEncoder = new LengthEncoder(pb, niceLen);
+
+        distSlotPricesSize = getDistSlot(dictSize - 1) + 1;
+        distSlotPrices = new int[DIST_STATES][distSlotPricesSize];
+
+        reset();
+    }
+
+    public LZEncoder getLZEncoder() {
+        return lz;
+    }
+
+    public void reset() {
+        super.reset();
+        literalEncoder.reset();
+        matchLenEncoder.reset();
+        repLenEncoder.reset();
+        distPriceCount = 0;
+        alignPriceCount = 0;
+
+        uncompressedSize += readAhead + 1;
+        readAhead = -1;
+    }
+
+    public int getUncompressedSize() {
+        return uncompressedSize;
+    }
+
+    public void resetUncompressedSize() {
+        uncompressedSize = 0;
+    }
+
+    /**
+     * Compress for LZMA1.
+     */
+    public void encodeForLZMA1() throws IOException {
+        if (!lz.isStarted() && !encodeInit())
+            return;
+
+        while (encodeSymbol()) {}
+    }
+
+    public void encodeLZMA1EndMarker() throws IOException {
+        // End of stream marker is encoded as a match with the maximum
+        // possible distance. The length is ignored by the decoder,
+        // but the minimum length has been used by the LZMA SDK.
+        //
+        // Distance is a 32-bit unsigned integer in LZMA.
+        // With Java's signed int, UINT32_MAX becomes -1.
+        int posState = (lz.getPos() - readAhead) & posMask;
+        rc.encodeBit(isMatch[state.get()], posState, 1);
+        rc.encodeBit(isRep, state.get(), 0);
+        encodeMatch(-1, MATCH_LEN_MIN, posState);
+    }
+
+    /**
+     * Compresses for LZMA2.
+     *
+     * @return      true if the LZMA2 chunk became full, false otherwise
+     */
+    public boolean encodeForLZMA2() {
+        // LZMA2 uses RangeEncoderToBuffer so IOExceptions aren't possible.
+        try {
+            if (!lz.isStarted() && !encodeInit())
+                return false;
+
+            while (uncompressedSize <= LZMA2_UNCOMPRESSED_LIMIT
+                    && rc.getPendingSize() <= LZMA2_COMPRESSED_LIMIT)
+                if (!encodeSymbol())
+                    return false;
+        } catch (IOException e) {
+            throw new Error();
+        }
+
+        return true;
+    }
+
+    private boolean encodeInit() throws IOException {
+        assert readAhead == -1;
+        if (!lz.hasEnoughData(0))
+            return false;
+
+        // The first symbol must be a literal unless using
+        // a preset dictionary. This code isn't run if using
+        // a preset dictionary.
+        skip(1);
+        rc.encodeBit(isMatch[state.get()], 0, 0);
+        literalEncoder.encodeInit();
+
+        --readAhead;
+        assert readAhead == -1;
+
+        ++uncompressedSize;
+        assert uncompressedSize == 1;
+
+        return true;
+    }
+
+    private boolean encodeSymbol() throws IOException {
+        if (!lz.hasEnoughData(readAhead + 1))
+            return false;
+
+        int len = getNextSymbol();
+
+        assert readAhead >= 0;
+        int posState = (lz.getPos() - readAhead) & posMask;
+
+        if (back == -1) {
+            // Literal i.e. eight-bit byte
+            assert len == 1;
+            rc.encodeBit(isMatch[state.get()], posState, 0);
+            literalEncoder.encode();
+        } else {
+            // Some type of match
+            rc.encodeBit(isMatch[state.get()], posState, 1);
+            if (back < REPS) {
+                // Repeated match i.e. the same distance
+                // has been used earlier.
+                assert lz.getMatchLen(-readAhead, reps[back], len) == len;
+                rc.encodeBit(isRep, state.get(), 1);
+                encodeRepMatch(back, len, posState);
+            } else {
+                // Normal match
+                assert lz.getMatchLen(-readAhead, back - REPS, len) == len;
+                rc.encodeBit(isRep, state.get(), 0);
+                encodeMatch(back - REPS, len, posState);
+            }
+        }
+
+        readAhead -= len;
+        uncompressedSize += len;
+
+        return true;
+    }
+
+    private void encodeMatch(int dist, int len, int posState)
+            throws IOException {
+        state.updateMatch();
+        matchLenEncoder.encode(len, posState);
+
+        int distSlot = getDistSlot(dist);
+        rc.encodeBitTree(distSlots[getDistState(len)], distSlot);
+
+        if (distSlot >= DIST_MODEL_START) {
+            int footerBits = (distSlot >>> 1) - 1;
+            int base = (2 | (distSlot & 1)) << footerBits;
+            int distReduced = dist - base;
+
+            if (distSlot < DIST_MODEL_END) {
+                rc.encodeReverseBitTree(
+                        distSpecial[distSlot - DIST_MODEL_START],
+                        distReduced);
+            } else {
+                rc.encodeDirectBits(distReduced >>> ALIGN_BITS,
+                                    footerBits - ALIGN_BITS);
+                rc.encodeReverseBitTree(distAlign, distReduced & ALIGN_MASK);
+                --alignPriceCount;
+            }
+        }
+
+        reps[3] = reps[2];
+        reps[2] = reps[1];
+        reps[1] = reps[0];
+        reps[0] = dist;
+
+        --distPriceCount;
+    }
+
+    private void encodeRepMatch(int rep, int len, int posState)
+            throws IOException {
+        if (rep == 0) {
+            rc.encodeBit(isRep0, state.get(), 0);
+            rc.encodeBit(isRep0Long[state.get()], posState, len == 1 ? 0 : 1);
+        } else {
+            int dist = reps[rep];
+            rc.encodeBit(isRep0, state.get(), 1);
+
+            if (rep == 1) {
+                rc.encodeBit(isRep1, state.get(), 0);
+            } else {
+                rc.encodeBit(isRep1, state.get(), 1);
+                rc.encodeBit(isRep2, state.get(), rep - 2);
+
+                if (rep == 3)
+                    reps[3] = reps[2];
+
+                reps[2] = reps[1];
+            }
+
+            reps[1] = reps[0];
+            reps[0] = dist;
+        }
+
+        if (len == 1) {
+            state.updateShortRep();
+        } else {
+            repLenEncoder.encode(len, posState);
+            state.updateLongRep();
+        }
+    }
+
+    Matches getMatches() {
+        ++readAhead;
+        Matches matches = lz.getMatches();
+        assert lz.verifyMatches(matches);
+        return matches;
+    }
+
+    void skip(int len) {
+        readAhead += len;
+        lz.skip(len);
+    }
+
+    int getAnyMatchPrice(State state, int posState) {
+        return RangeEncoder.getBitPrice(isMatch[state.get()][posState], 1);
+    }
+
+    int getNormalMatchPrice(int anyMatchPrice, State state) {
+        return anyMatchPrice
+               + RangeEncoder.getBitPrice(isRep[state.get()], 0);
+    }
+
+    int getAnyRepPrice(int anyMatchPrice, State state) {
+        return anyMatchPrice
+               + RangeEncoder.getBitPrice(isRep[state.get()], 1);
+    }
+
+    int getShortRepPrice(int anyRepPrice, State state, int posState) {
+        return anyRepPrice
+               + RangeEncoder.getBitPrice(isRep0[state.get()], 0)
+               + RangeEncoder.getBitPrice(isRep0Long[state.get()][posState],
+                                          0);
+    }
+
+    int getLongRepPrice(int anyRepPrice, int rep, State state, int posState) {
+        int price = anyRepPrice;
+
+        if (rep == 0) {
+            price += RangeEncoder.getBitPrice(isRep0[state.get()], 0)
+                     + RangeEncoder.getBitPrice(
+                       isRep0Long[state.get()][posState], 1);
+        } else {
+            price += RangeEncoder.getBitPrice(isRep0[state.get()], 1);
+
+            if (rep == 1)
+                price += RangeEncoder.getBitPrice(isRep1[state.get()], 0);
+            else
+                price += RangeEncoder.getBitPrice(isRep1[state.get()], 1)
+                         + RangeEncoder.getBitPrice(isRep2[state.get()],
+                                                    rep - 2);
+        }
+
+        return price;
+    }
+
+    int getLongRepAndLenPrice(int rep, int len, State state, int posState) {
+        int anyMatchPrice = getAnyMatchPrice(state, posState);
+        int anyRepPrice = getAnyRepPrice(anyMatchPrice, state);
+        int longRepPrice = getLongRepPrice(anyRepPrice, rep, state, posState);
+        return longRepPrice + repLenEncoder.getPrice(len, posState);
+    }
+
+    int getMatchAndLenPrice(int normalMatchPrice,
+                            int dist, int len, int posState) {
+        int price = normalMatchPrice
+                    + matchLenEncoder.getPrice(len, posState);
+        int distState = getDistState(len);
+
+        if (dist < FULL_DISTANCES) {
+            price += fullDistPrices[distState][dist];
+        } else {
+            // Note that distSlotPrices includes also
+            // the price of direct bits.
+            int distSlot = getDistSlot(dist);
+            price += distSlotPrices[distState][distSlot]
+                     + alignPrices[dist & ALIGN_MASK];
+        }
+
+        return price;
+    }
+
+    private void updateDistPrices() {
+        distPriceCount = DIST_PRICE_UPDATE_INTERVAL;
+
+        for (int distState = 0; distState < DIST_STATES; ++distState) {
+            for (int distSlot = 0; distSlot < distSlotPricesSize; ++distSlot)
+                distSlotPrices[distState][distSlot]
+                        = RangeEncoder.getBitTreePrice(
+                          distSlots[distState], distSlot);
+
+            for (int distSlot = DIST_MODEL_END; distSlot < distSlotPricesSize;
+                    ++distSlot) {
+                int count = (distSlot >>> 1) - 1 - ALIGN_BITS;
+                distSlotPrices[distState][distSlot]
+                        += RangeEncoder.getDirectBitsPrice(count);
+            }
+
+            for (int dist = 0; dist < DIST_MODEL_START; ++dist)
+                fullDistPrices[distState][dist]
+                        = distSlotPrices[distState][dist];
+        }
+
+        int dist = DIST_MODEL_START;
+        for (int distSlot = DIST_MODEL_START; distSlot < DIST_MODEL_END;
+                ++distSlot) {
+            int footerBits = (distSlot >>> 1) - 1;
+            int base = (2 | (distSlot & 1)) << footerBits;
+
+            int limit = distSpecial[distSlot - DIST_MODEL_START].length;
+            for (int i = 0; i < limit; ++i) {
+                int distReduced = dist - base;
+                int price = RangeEncoder.getReverseBitTreePrice(
+                        distSpecial[distSlot - DIST_MODEL_START],
+                        distReduced);
+
+                for (int distState = 0; distState < DIST_STATES; ++distState)
+                    fullDistPrices[distState][dist]
+                            = distSlotPrices[distState][distSlot] + price;
+
+                ++dist;
+            }
+        }
+
+        assert dist == FULL_DISTANCES;
+    }
+
+    private void updateAlignPrices() {
+        alignPriceCount = ALIGN_PRICE_UPDATE_INTERVAL;
+
+        for (int i = 0; i < ALIGN_SIZE; ++i)
+            alignPrices[i] = RangeEncoder.getReverseBitTreePrice(distAlign,
+                                                                 i);
+    }
+
+    /**
+     * Updates the lookup tables used for calculating match distance
+     * and length prices. The updating is skipped for performance reasons
+     * if the tables haven't changed much since the previous update.
+     */
+    void updatePrices() {
+        if (distPriceCount <= 0)
+            updateDistPrices();
+
+        if (alignPriceCount <= 0)
+            updateAlignPrices();
+
+        matchLenEncoder.updatePrices();
+        repLenEncoder.updatePrices();
+    }
+
+
+    class LiteralEncoder extends LiteralCoder {
+        private final LiteralSubencoder[] subencoders;
+
+        LiteralEncoder(int lc, int lp) {
+            super(lc, lp);
+
+            subencoders = new LiteralSubencoder[1 << (lc + lp)];
+            for (int i = 0; i < subencoders.length; ++i)
+                subencoders[i] = new LiteralSubencoder();
+        }
+
+        void reset() {
+            for (int i = 0; i < subencoders.length; ++i)
+                subencoders[i].reset();
+        }
+
+        void encodeInit() throws IOException {
+            // When encoding the first byte of the stream, there is
+            // no previous byte in the dictionary so the encode function
+            // wouldn't work.
+            assert readAhead >= 0;
+            subencoders[0].encode();
+        }
+
+        void encode() throws IOException {
+            assert readAhead >= 0;
+            int i = getSubcoderIndex(lz.getByte(1 + readAhead),
+                                     lz.getPos() - readAhead);
+            subencoders[i].encode();
+        }
+
+        int getPrice(int curByte, int matchByte,
+                     int prevByte, int pos, State state) {
+            int price = RangeEncoder.getBitPrice(
+                    isMatch[state.get()][pos & posMask], 0);
+
+            int i = getSubcoderIndex(prevByte, pos);
+            price += state.isLiteral()
+                   ? subencoders[i].getNormalPrice(curByte)
+                   : subencoders[i].getMatchedPrice(curByte, matchByte);
+
+            return price;
+        }
+
+        private class LiteralSubencoder extends LiteralSubcoder {
+            void encode() throws IOException {
+                int symbol = lz.getByte(readAhead) | 0x100;
+
+                if (state.isLiteral()) {
+                    int subencoderIndex;
+                    int bit;
+
+                    do {
+                        subencoderIndex = symbol >>> 8;
+                        bit = (symbol >>> 7) & 1;
+                        rc.encodeBit(probs, subencoderIndex, bit);
+                        symbol <<= 1;
+                    } while (symbol < 0x10000);
+
+                } else {
+                    int matchByte = lz.getByte(reps[0] + 1 + readAhead);
+                    int offset = 0x100;
+                    int subencoderIndex;
+                    int matchBit;
+                    int bit;
+
+                    do {
+                        matchByte <<= 1;
+                        matchBit = matchByte & offset;
+                        subencoderIndex = offset + matchBit + (symbol >>> 8);
+                        bit = (symbol >>> 7) & 1;
+                        rc.encodeBit(probs, subencoderIndex, bit);
+                        symbol <<= 1;
+                        offset &= ~(matchByte ^ symbol);
+                    } while (symbol < 0x10000);
+                }
+
+                state.updateLiteral();
+            }
+
+            int getNormalPrice(int symbol) {
+                int price = 0;
+                int subencoderIndex;
+                int bit;
+
+                symbol |= 0x100;
+
+                do {
+                    subencoderIndex = symbol >>> 8;
+                    bit = (symbol >>> 7) & 1;
+                    price += RangeEncoder.getBitPrice(probs[subencoderIndex],
+                                                      bit);
+                    symbol <<= 1;
+                } while (symbol < (0x100 << 8));
+
+                return price;
+            }
+
+            int getMatchedPrice(int symbol, int matchByte) {
+                int price = 0;
+                int offset = 0x100;
+                int subencoderIndex;
+                int matchBit;
+                int bit;
+
+                symbol |= 0x100;
+
+                do {
+                    matchByte <<= 1;
+                    matchBit = matchByte & offset;
+                    subencoderIndex = offset + matchBit + (symbol >>> 8);
+                    bit = (symbol >>> 7) & 1;
+                    price += RangeEncoder.getBitPrice(probs[subencoderIndex],
+                                                      bit);
+                    symbol <<= 1;
+                    offset &= ~(matchByte ^ symbol);
+                } while (symbol < (0x100 << 8));
+
+                return price;
+            }
+        }
+    }
+
+
+    class LengthEncoder extends LengthCoder {
+        /**
+         * The prices are updated after at least
+         * <code>PRICE_UPDATE_INTERVAL</code> many lengths
+         * have been encoded with the same posState.
+         */
+        private static final int PRICE_UPDATE_INTERVAL = 32; // FIXME?
+
+        private final int[] counters;
+        private final int[][] prices;
+
+        LengthEncoder(int pb, int niceLen) {
+            int posStates = 1 << pb;
+            counters = new int[posStates];
+
+            // Always allocate at least LOW_SYMBOLS + MID_SYMBOLS because
+            // it makes updatePrices slightly simpler. The prices aren't
+            // usually needed anyway if niceLen < 18.
+            int lenSymbols = Math.max(niceLen - MATCH_LEN_MIN + 1,
+                                      LOW_SYMBOLS + MID_SYMBOLS);
+            prices = new int[posStates][lenSymbols];
+        }
+
+        void reset() {
+            super.reset();
+
+            // Reset counters to zero to force price update before
+            // the prices are needed.
+            for (int i = 0; i < counters.length; ++i)
+                counters[i] = 0;
+        }
+
+        void encode(int len, int posState) throws IOException {
+            len -= MATCH_LEN_MIN;
+
+            if (len < LOW_SYMBOLS) {
+                rc.encodeBit(choice, 0, 0);
+                rc.encodeBitTree(low[posState], len);
+            } else {
+                rc.encodeBit(choice, 0, 1);
+                len -= LOW_SYMBOLS;
+
+                if (len < MID_SYMBOLS) {
+                    rc.encodeBit(choice, 1, 0);
+                    rc.encodeBitTree(mid[posState], len);
+                } else {
+                    rc.encodeBit(choice, 1, 1);
+                    rc.encodeBitTree(high, len - MID_SYMBOLS);
+                }
+            }
+
+            --counters[posState];
+        }
+
+        int getPrice(int len, int posState) {
+            return prices[posState][len - MATCH_LEN_MIN];
+        }
+
+        void updatePrices() {
+            for (int posState = 0; posState < counters.length; ++posState) {
+                if (counters[posState] <= 0) {
+                    counters[posState] = PRICE_UPDATE_INTERVAL;
+                    updatePrices(posState);
+                }
+            }
+        }
+
+        private void updatePrices(int posState) {
+            int choice0Price = RangeEncoder.getBitPrice(choice[0], 0);
+
+            int i = 0;
+            for (; i < LOW_SYMBOLS; ++i)
+                prices[posState][i] = choice0Price
+                        + RangeEncoder.getBitTreePrice(low[posState], i);
+
+            choice0Price = RangeEncoder.getBitPrice(choice[0], 1);
+            int choice1Price = RangeEncoder.getBitPrice(choice[1], 0);
+
+            for (; i < LOW_SYMBOLS + MID_SYMBOLS; ++i)
+                prices[posState][i] = choice0Price + choice1Price
+                         + RangeEncoder.getBitTreePrice(mid[posState],
+                                                        i - LOW_SYMBOLS);
+
+            choice1Price = RangeEncoder.getBitPrice(choice[1], 1);
+
+            for (; i < prices[posState].length; ++i)
+                prices[posState][i] = choice0Price + choice1Price
+                         + RangeEncoder.getBitTreePrice(high, i - LOW_SYMBOLS
+                                                              - MID_SYMBOLS);
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/lzma/LZMAEncoderFast.java b/src/org/tukaani/xz/lzma/LZMAEncoderFast.java
new file mode 100644
index 0000000..f8230ee
--- /dev/null
+++ b/src/org/tukaani/xz/lzma/LZMAEncoderFast.java
@@ -0,0 +1,153 @@
+/*
+ * LZMAEncoderFast
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lzma;
+
+import org.tukaani.xz.ArrayCache;
+import org.tukaani.xz.lz.LZEncoder;
+import org.tukaani.xz.lz.Matches;
+import org.tukaani.xz.rangecoder.RangeEncoder;
+
+final class LZMAEncoderFast extends LZMAEncoder {
+    private static final int EXTRA_SIZE_BEFORE = 1;
+    private static final int EXTRA_SIZE_AFTER = MATCH_LEN_MAX - 1;
+
+    private Matches matches = null;
+
+    static int getMemoryUsage(int dictSize, int extraSizeBefore, int mf) {
+        return LZEncoder.getMemoryUsage(
+                dictSize, Math.max(extraSizeBefore, EXTRA_SIZE_BEFORE),
+                EXTRA_SIZE_AFTER, MATCH_LEN_MAX, mf);
+    }
+
+    LZMAEncoderFast(RangeEncoder rc, int lc, int lp, int pb,
+                           int dictSize, int extraSizeBefore,
+                           int niceLen, int mf, int depthLimit,
+                           ArrayCache arrayCache) {
+        super(rc, LZEncoder.getInstance(dictSize,
+                                        Math.max(extraSizeBefore,
+                                                 EXTRA_SIZE_BEFORE),
+                                        EXTRA_SIZE_AFTER,
+                                        niceLen, MATCH_LEN_MAX,
+                                        mf, depthLimit, arrayCache),
+              lc, lp, pb, dictSize, niceLen);
+    }
+
+    private boolean changePair(int smallDist, int bigDist) {
+        return smallDist < (bigDist >>> 7);
+    }
+
+    int getNextSymbol() {
+        // Get the matches for the next byte unless readAhead indicates
+        // that we already got the new matches during the previous call
+        // to this function.
+        if (readAhead == -1)
+            matches = getMatches();
+
+        back = -1;
+
+        // Get the number of bytes available in the dictionary, but
+        // not more than the maximum match length. If there aren't
+        // enough bytes remaining to encode a match at all, return
+        // immediately to encode this byte as a literal.
+        int avail = Math.min(lz.getAvail(), MATCH_LEN_MAX);
+        if (avail < MATCH_LEN_MIN)
+            return 1;
+
+        // Look for a match from the previous four match distances.
+        int bestRepLen = 0;
+        int bestRepIndex = 0;
+        for (int rep = 0; rep < REPS; ++rep) {
+            int len = lz.getMatchLen(reps[rep], avail);
+            if (len < MATCH_LEN_MIN)
+                continue;
+
+            // If it is long enough, return it.
+            if (len >= niceLen) {
+                back = rep;
+                skip(len - 1);
+                return len;
+            }
+
+            // Remember the index and length of the best repeated match.
+            if (len > bestRepLen) {
+                bestRepIndex = rep;
+                bestRepLen = len;
+            }
+        }
+
+        int mainLen = 0;
+        int mainDist = 0;
+
+        if (matches.count > 0) {
+            mainLen = matches.len[matches.count - 1];
+            mainDist = matches.dist[matches.count - 1];
+
+            if (mainLen >= niceLen) {
+                back = mainDist + REPS;
+                skip(mainLen - 1);
+                return mainLen;
+            }
+
+            while (matches.count > 1
+                    && mainLen == matches.len[matches.count - 2] + 1) {
+                if (!changePair(matches.dist[matches.count - 2], mainDist))
+                    break;
+
+                --matches.count;
+                mainLen = matches.len[matches.count - 1];
+                mainDist = matches.dist[matches.count - 1];
+            }
+
+            if (mainLen == MATCH_LEN_MIN && mainDist >= 0x80)
+                mainLen = 1;
+        }
+
+        if (bestRepLen >= MATCH_LEN_MIN) {
+            if (bestRepLen + 1 >= mainLen
+                    || (bestRepLen + 2 >= mainLen && mainDist >= (1 << 9))
+                    || (bestRepLen + 3 >= mainLen && mainDist >= (1 << 15))) {
+                back = bestRepIndex;
+                skip(bestRepLen - 1);
+                return bestRepLen;
+            }
+        }
+
+        if (mainLen < MATCH_LEN_MIN || avail <= MATCH_LEN_MIN)
+            return 1;
+
+        // Get the next match. Test if it is better than the current match.
+        // If so, encode the current byte as a literal.
+        matches = getMatches();
+
+        if (matches.count > 0) {
+            int newLen = matches.len[matches.count - 1];
+            int newDist = matches.dist[matches.count - 1];
+
+            if ((newLen >= mainLen && newDist < mainDist)
+                    || (newLen == mainLen + 1
+                        && !changePair(mainDist, newDist))
+                    || newLen > mainLen + 1
+                    || (newLen + 1 >= mainLen
+                        && mainLen >= MATCH_LEN_MIN + 1
+                        && changePair(newDist, mainDist)))
+                return 1;
+        }
+
+        int limit = Math.max(mainLen - 1, MATCH_LEN_MIN);
+        for (int rep = 0; rep < REPS; ++rep)
+            if (lz.getMatchLen(reps[rep], limit) == limit)
+                return 1;
+
+        back = mainDist + REPS;
+        skip(mainLen - 2);
+        return mainLen;
+    }
+}
diff --git a/src/org/tukaani/xz/lzma/LZMAEncoderNormal.java b/src/org/tukaani/xz/lzma/LZMAEncoderNormal.java
new file mode 100644
index 0000000..8079cd2
--- /dev/null
+++ b/src/org/tukaani/xz/lzma/LZMAEncoderNormal.java
@@ -0,0 +1,568 @@
+/*
+ * LZMAEncoderNormal
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lzma;
+
+import org.tukaani.xz.ArrayCache;
+import org.tukaani.xz.lz.LZEncoder;
+import org.tukaani.xz.lz.Matches;
+import org.tukaani.xz.rangecoder.RangeEncoder;
+
+final class LZMAEncoderNormal extends LZMAEncoder {
+    private static final int OPTS = 4096;
+
+    private static final int EXTRA_SIZE_BEFORE = OPTS;
+    private static final int EXTRA_SIZE_AFTER = OPTS;
+
+    private final Optimum[] opts = new Optimum[OPTS];
+    private int optCur = 0;
+    private int optEnd = 0;
+
+    private Matches matches;
+
+    // These are fields solely to avoid allocating the objects again and
+    // again on each function call.
+    private final int[] repLens = new int[REPS];
+    private final State nextState = new State();
+
+    static int getMemoryUsage(int dictSize, int extraSizeBefore, int mf) {
+        return LZEncoder.getMemoryUsage(dictSize,
+                   Math.max(extraSizeBefore, EXTRA_SIZE_BEFORE),
+                   EXTRA_SIZE_AFTER, MATCH_LEN_MAX, mf)
+               + OPTS * 64 / 1024;
+    }
+
+    LZMAEncoderNormal(RangeEncoder rc, int lc, int lp, int pb,
+                             int dictSize, int extraSizeBefore,
+                             int niceLen, int mf, int depthLimit,
+                             ArrayCache arrayCache) {
+        super(rc, LZEncoder.getInstance(dictSize,
+                                        Math.max(extraSizeBefore,
+                                                 EXTRA_SIZE_BEFORE),
+                                        EXTRA_SIZE_AFTER,
+                                        niceLen, MATCH_LEN_MAX,
+                                        mf, depthLimit, arrayCache),
+              lc, lp, pb, dictSize, niceLen);
+
+        for (int i = 0; i < OPTS; ++i)
+            opts[i] = new Optimum();
+    }
+
+    public void reset() {
+        optCur = 0;
+        optEnd = 0;
+        super.reset();
+    }
+
+    /**
+     * Converts the opts array from backward indexes to forward indexes.
+     * Then it will be simple to get the next symbol from the array
+     * in later calls to <code>getNextSymbol()</code>.
+     */
+    private int convertOpts() {
+        optEnd = optCur;
+
+        int optPrev = opts[optCur].optPrev;
+
+        do {
+            Optimum opt = opts[optCur];
+
+            if (opt.prev1IsLiteral) {
+                opts[optPrev].optPrev = optCur;
+                opts[optPrev].backPrev = -1;
+                optCur = optPrev--;
+
+                if (opt.hasPrev2) {
+                    opts[optPrev].optPrev = optPrev + 1;
+                    opts[optPrev].backPrev = opt.backPrev2;
+                    optCur = optPrev;
+                    optPrev = opt.optPrev2;
+                }
+            }
+
+            int temp = opts[optPrev].optPrev;
+            opts[optPrev].optPrev = optCur;
+            optCur = optPrev;
+            optPrev = temp;
+        } while (optCur > 0);
+
+        optCur = opts[0].optPrev;
+        back = opts[optCur].backPrev;
+        return optCur;
+    }
+
+    int getNextSymbol() {
+        // If there are pending symbols from an earlier call to this
+        // function, return those symbols first.
+        if (optCur < optEnd) {
+            int len = opts[optCur].optPrev - optCur;
+            optCur = opts[optCur].optPrev;
+            back = opts[optCur].backPrev;
+            return len;
+        }
+
+        assert optCur == optEnd;
+        optCur = 0;
+        optEnd = 0;
+        back = -1;
+
+        if (readAhead == -1)
+            matches = getMatches();
+
+        // Get the number of bytes available in the dictionary, but
+        // not more than the maximum match length. If there aren't
+        // enough bytes remaining to encode a match at all, return
+        // immediately to encode this byte as a literal.
+        int avail = Math.min(lz.getAvail(), MATCH_LEN_MAX);
+        if (avail < MATCH_LEN_MIN)
+            return 1;
+
+        // Get the lengths of repeated matches.
+        int repBest = 0;
+        for (int rep = 0; rep < REPS; ++rep) {
+            repLens[rep] = lz.getMatchLen(reps[rep], avail);
+
+            if (repLens[rep] < MATCH_LEN_MIN) {
+                repLens[rep] = 0;
+                continue;
+            }
+
+            if (repLens[rep] > repLens[repBest])
+                repBest = rep;
+        }
+
+        // Return if the best repeated match is at least niceLen bytes long.
+        if (repLens[repBest] >= niceLen) {
+            back = repBest;
+            skip(repLens[repBest] - 1);
+            return repLens[repBest];
+        }
+
+        // Initialize mainLen and mainDist to the longest match found
+        // by the match finder.
+        int mainLen = 0;
+        int mainDist = 0;
+        if (matches.count > 0) {
+            mainLen = matches.len[matches.count - 1];
+            mainDist = matches.dist[matches.count - 1];
+
+            // Return if it is at least niceLen bytes long.
+            if (mainLen >= niceLen) {
+                back = mainDist + REPS;
+                skip(mainLen - 1);
+                return mainLen;
+            }
+        }
+
+        int curByte = lz.getByte(0);
+        int matchByte = lz.getByte(reps[0] + 1);
+
+        // If the match finder found no matches and this byte cannot be
+        // encoded as a repeated match (short or long), we must be return
+        // to have the byte encoded as a literal.
+        if (mainLen < MATCH_LEN_MIN && curByte != matchByte
+                && repLens[repBest] < MATCH_LEN_MIN)
+            return 1;
+
+
+        int pos = lz.getPos();
+        int posState = pos & posMask;
+
+        // Calculate the price of encoding the current byte as a literal.
+        {
+            int prevByte = lz.getByte(1);
+            int literalPrice = literalEncoder.getPrice(curByte, matchByte,
+                                                       prevByte, pos, state);
+            opts[1].set1(literalPrice, 0, -1);
+        }
+
+        int anyMatchPrice = getAnyMatchPrice(state, posState);
+        int anyRepPrice = getAnyRepPrice(anyMatchPrice, state);
+
+        // If it is possible to encode this byte as a short rep, see if
+        // it is cheaper than encoding it as a literal.
+        if (matchByte == curByte) {
+            int shortRepPrice = getShortRepPrice(anyRepPrice,
+                                                 state, posState);
+            if (shortRepPrice < opts[1].price)
+                opts[1].set1(shortRepPrice, 0, 0);
+        }
+
+        // Return if there is neither normal nor long repeated match. Use
+        // a short match instead of a literal if is is possible and cheaper.
+        optEnd = Math.max(mainLen, repLens[repBest]);
+        if (optEnd < MATCH_LEN_MIN) {
+            assert optEnd == 0 : optEnd;
+            back = opts[1].backPrev;
+            return 1;
+        }
+
+
+        // Update the lookup tables for distances and lengths before using
+        // those price calculation functions. (The price function above
+        // don't need these tables.)
+        updatePrices();
+
+        // Initialize the state and reps of this position in opts[].
+        // updateOptStateAndReps() will need these to get the new
+        // state and reps for the next byte.
+        opts[0].state.set(state);
+        System.arraycopy(reps, 0, opts[0].reps, 0, REPS);
+
+        // Initialize the prices for latter opts that will be used below.
+        for (int i = optEnd; i >= MATCH_LEN_MIN; --i)
+            opts[i].reset();
+
+        // Calculate the prices of repeated matches of all lengths.
+        for (int rep = 0; rep < REPS; ++rep) {
+            int repLen = repLens[rep];
+            if (repLen < MATCH_LEN_MIN)
+                continue;
+
+            int longRepPrice = getLongRepPrice(anyRepPrice, rep,
+                                               state, posState);
+            do {
+                int price = longRepPrice + repLenEncoder.getPrice(repLen,
+                                                                  posState);
+                if (price < opts[repLen].price)
+                    opts[repLen].set1(price, 0, rep);
+            } while (--repLen >= MATCH_LEN_MIN);
+        }
+
+        // Calculate the prices of normal matches that are longer than rep0.
+        {
+            int len = Math.max(repLens[0] + 1, MATCH_LEN_MIN);
+            if (len <= mainLen) {
+                int normalMatchPrice = getNormalMatchPrice(anyMatchPrice,
+                                                           state);
+
+                // Set i to the index of the shortest match that is
+                // at least len bytes long.
+                int i = 0;
+                while (len > matches.len[i])
+                    ++i;
+
+                while (true) {
+                    int dist = matches.dist[i];
+                    int price = getMatchAndLenPrice(normalMatchPrice,
+                                                    dist, len, posState);
+                    if (price < opts[len].price)
+                        opts[len].set1(price, 0, dist + REPS);
+
+                    if (len == matches.len[i])
+                        if (++i == matches.count)
+                            break;
+
+                    ++len;
+                }
+            }
+        }
+
+
+        avail = Math.min(lz.getAvail(), OPTS - 1);
+
+        // Get matches for later bytes and optimize the use of LZMA symbols
+        // by calculating the prices and picking the cheapest symbol
+        // combinations.
+        while (++optCur < optEnd) {
+            matches = getMatches();
+            if (matches.count > 0
+                    && matches.len[matches.count - 1] >= niceLen)
+                break;
+
+            --avail;
+            ++pos;
+            posState = pos & posMask;
+
+            updateOptStateAndReps();
+            anyMatchPrice = opts[optCur].price
+                            + getAnyMatchPrice(opts[optCur].state, posState);
+            anyRepPrice = getAnyRepPrice(anyMatchPrice, opts[optCur].state);
+
+            calc1BytePrices(pos, posState, avail, anyRepPrice);
+
+            if (avail >= MATCH_LEN_MIN) {
+                int startLen = calcLongRepPrices(pos, posState,
+                                                 avail, anyRepPrice);
+                if (matches.count > 0)
+                    calcNormalMatchPrices(pos, posState, avail,
+                                          anyMatchPrice, startLen);
+            }
+        }
+
+        return convertOpts();
+    }
+
+    /**
+     * Updates the state and reps for the current byte in the opts array.
+     */
+    private void updateOptStateAndReps() {
+        int optPrev = opts[optCur].optPrev;
+        assert optPrev < optCur;
+
+        if (opts[optCur].prev1IsLiteral) {
+            --optPrev;
+
+            if (opts[optCur].hasPrev2) {
+                opts[optCur].state.set(opts[opts[optCur].optPrev2].state);
+                if (opts[optCur].backPrev2 < REPS)
+                    opts[optCur].state.updateLongRep();
+                else
+                    opts[optCur].state.updateMatch();
+            } else {
+                opts[optCur].state.set(opts[optPrev].state);
+            }
+
+            opts[optCur].state.updateLiteral();
+        } else {
+            opts[optCur].state.set(opts[optPrev].state);
+        }
+
+        if (optPrev == optCur - 1) {
+            // Must be either a short rep or a literal.
+            assert opts[optCur].backPrev == 0 || opts[optCur].backPrev == -1;
+
+            if (opts[optCur].backPrev == 0)
+                opts[optCur].state.updateShortRep();
+            else
+                opts[optCur].state.updateLiteral();
+
+            System.arraycopy(opts[optPrev].reps, 0,
+                             opts[optCur].reps, 0, REPS);
+        } else {
+            int back;
+            if (opts[optCur].prev1IsLiteral && opts[optCur].hasPrev2) {
+                optPrev = opts[optCur].optPrev2;
+                back = opts[optCur].backPrev2;
+                opts[optCur].state.updateLongRep();
+            } else {
+                back = opts[optCur].backPrev;
+                if (back < REPS)
+                    opts[optCur].state.updateLongRep();
+                else
+                    opts[optCur].state.updateMatch();
+            }
+
+            if (back < REPS) {
+                opts[optCur].reps[0] = opts[optPrev].reps[back];
+
+                int rep;
+                for (rep = 1; rep <= back; ++rep)
+                    opts[optCur].reps[rep] = opts[optPrev].reps[rep - 1];
+
+                for (; rep < REPS; ++rep)
+                    opts[optCur].reps[rep] = opts[optPrev].reps[rep];
+            } else {
+                opts[optCur].reps[0] = back - REPS;
+                System.arraycopy(opts[optPrev].reps, 0,
+                                 opts[optCur].reps, 1, REPS - 1);
+            }
+        }
+    }
+
+    /**
+     * Calculates prices of a literal, a short rep, and literal + rep0.
+     */
+    private void calc1BytePrices(int pos, int posState,
+                                 int avail, int anyRepPrice) {
+        // This will be set to true if using a literal or a short rep.
+        boolean nextIsByte = false;
+
+        int curByte = lz.getByte(0);
+        int matchByte = lz.getByte(opts[optCur].reps[0] + 1);
+
+        // Try a literal.
+        int literalPrice = opts[optCur].price
+                + literalEncoder.getPrice(curByte, matchByte, lz.getByte(1),
+                                          pos, opts[optCur].state);
+        if (literalPrice < opts[optCur + 1].price) {
+            opts[optCur + 1].set1(literalPrice, optCur, -1);
+            nextIsByte = true;
+        }
+
+        // Try a short rep.
+        if (matchByte == curByte && (opts[optCur + 1].optPrev == optCur
+                                      || opts[optCur + 1].backPrev != 0)) {
+            int shortRepPrice = getShortRepPrice(anyRepPrice,
+                                                 opts[optCur].state,
+                                                 posState);
+            if (shortRepPrice <= opts[optCur + 1].price) {
+                opts[optCur + 1].set1(shortRepPrice, optCur, 0);
+                nextIsByte = true;
+            }
+        }
+
+        // If neither a literal nor a short rep was the cheapest choice,
+        // try literal + long rep0.
+        if (!nextIsByte && matchByte != curByte && avail > MATCH_LEN_MIN) {
+            int lenLimit = Math.min(niceLen, avail - 1);
+            int len = lz.getMatchLen(1, opts[optCur].reps[0], lenLimit);
+
+            if (len >= MATCH_LEN_MIN) {
+                nextState.set(opts[optCur].state);
+                nextState.updateLiteral();
+                int nextPosState = (pos + 1) & posMask;
+                int price = literalPrice
+                            + getLongRepAndLenPrice(0, len,
+                                                    nextState, nextPosState);
+
+                int i = optCur + 1 + len;
+                while (optEnd < i)
+                    opts[++optEnd].reset();
+
+                if (price < opts[i].price)
+                    opts[i].set2(price, optCur, 0);
+            }
+        }
+    }
+
+    /**
+     * Calculates prices of long rep and long rep + literal + rep0.
+     */
+    private int calcLongRepPrices(int pos, int posState,
+                                  int avail, int anyRepPrice) {
+        int startLen = MATCH_LEN_MIN;
+        int lenLimit = Math.min(avail, niceLen);
+
+        for (int rep = 0; rep < REPS; ++rep) {
+            int len = lz.getMatchLen(opts[optCur].reps[rep], lenLimit);
+            if (len < MATCH_LEN_MIN)
+                continue;
+
+            while (optEnd < optCur + len)
+                opts[++optEnd].reset();
+
+            int longRepPrice = getLongRepPrice(anyRepPrice, rep,
+                                               opts[optCur].state, posState);
+
+            for (int i = len; i >= MATCH_LEN_MIN; --i) {
+                int price = longRepPrice
+                            + repLenEncoder.getPrice(i, posState);
+                if (price < opts[optCur + i].price)
+                    opts[optCur + i].set1(price, optCur, rep);
+            }
+
+            if (rep == 0)
+                startLen = len + 1;
+
+            int len2Limit = Math.min(niceLen, avail - len - 1);
+            int len2 = lz.getMatchLen(len + 1, opts[optCur].reps[rep],
+                                      len2Limit);
+
+            if (len2 >= MATCH_LEN_MIN) {
+                // Rep
+                int price = longRepPrice
+                            + repLenEncoder.getPrice(len, posState);
+                nextState.set(opts[optCur].state);
+                nextState.updateLongRep();
+
+                // Literal
+                int curByte = lz.getByte(len, 0);
+                int matchByte = lz.getByte(0); // lz.getByte(len, len)
+                int prevByte = lz.getByte(len, 1);
+                price += literalEncoder.getPrice(curByte, matchByte, prevByte,
+                                                 pos + len, nextState);
+                nextState.updateLiteral();
+
+                // Rep0
+                int nextPosState = (pos + len + 1) & posMask;
+                price += getLongRepAndLenPrice(0, len2,
+                                               nextState, nextPosState);
+
+                int i = optCur + len + 1 + len2;
+                while (optEnd < i)
+                    opts[++optEnd].reset();
+
+                if (price < opts[i].price)
+                    opts[i].set3(price, optCur, rep, len, 0);
+            }
+        }
+
+        return startLen;
+    }
+
+    /**
+     * Calculates prices of a normal match and normal match + literal + rep0.
+     */
+    private void calcNormalMatchPrices(int pos, int posState, int avail,
+                                       int anyMatchPrice, int startLen) {
+        // If the longest match is so long that it would not fit into
+        // the opts array, shorten the matches.
+        if (matches.len[matches.count - 1] > avail) {
+            matches.count = 0;
+            while (matches.len[matches.count] < avail)
+                ++matches.count;
+
+            matches.len[matches.count++] = avail;
+        }
+
+        if (matches.len[matches.count - 1] < startLen)
+            return;
+
+        while (optEnd < optCur + matches.len[matches.count - 1])
+            opts[++optEnd].reset();
+
+        int normalMatchPrice = getNormalMatchPrice(anyMatchPrice,
+                                                   opts[optCur].state);
+
+        int match = 0;
+        while (startLen > matches.len[match])
+            ++match;
+
+        for (int len = startLen; ; ++len) {
+            int dist = matches.dist[match];
+
+            // Calculate the price of a match of len bytes from the nearest
+            // possible distance.
+            int matchAndLenPrice = getMatchAndLenPrice(normalMatchPrice,
+                                                       dist, len, posState);
+            if (matchAndLenPrice < opts[optCur + len].price)
+                opts[optCur + len].set1(matchAndLenPrice,
+                                        optCur, dist + REPS);
+
+            if (len != matches.len[match])
+                continue;
+
+            // Try match + literal + rep0. First get the length of the rep0.
+            int len2Limit = Math.min(niceLen, avail - len - 1);
+            int len2 = lz.getMatchLen(len + 1, dist, len2Limit);
+
+            if (len2 >= MATCH_LEN_MIN) {
+                nextState.set(opts[optCur].state);
+                nextState.updateMatch();
+
+                // Literal
+                int curByte = lz.getByte(len, 0);
+                int matchByte = lz.getByte(0); // lz.getByte(len, len)
+                int prevByte = lz.getByte(len, 1);
+                int price = matchAndLenPrice
+                        + literalEncoder.getPrice(curByte, matchByte,
+                                                  prevByte, pos + len,
+                                                  nextState);
+                nextState.updateLiteral();
+
+                // Rep0
+                int nextPosState = (pos + len + 1) & posMask;
+                price += getLongRepAndLenPrice(0, len2,
+                                               nextState, nextPosState);
+
+                int i = optCur + len + 1 + len2;
+                while (optEnd < i)
+                    opts[++optEnd].reset();
+
+                if (price < opts[i].price)
+                    opts[i].set3(price, optCur, dist + REPS, len, 0);
+            }
+
+            if (++match == matches.count)
+                break;
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/lzma/Optimum.java b/src/org/tukaani/xz/lzma/Optimum.java
new file mode 100644
index 0000000..845ac97
--- /dev/null
+++ b/src/org/tukaani/xz/lzma/Optimum.java
@@ -0,0 +1,73 @@
+/*
+ * Optimum
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lzma;
+
+final class Optimum {
+    private static final int INFINITY_PRICE = 1 << 30;
+
+    final State state = new State();
+    final int[] reps = new int[LZMACoder.REPS];
+
+    /**
+     * Cumulative price of arriving to this byte.
+     */
+    int price;
+
+    int optPrev;
+    int backPrev;
+    boolean prev1IsLiteral;
+
+    boolean hasPrev2;
+    int optPrev2;
+    int backPrev2;
+
+    /**
+     * Resets the price.
+     */
+    void reset() {
+        price = INFINITY_PRICE;
+    }
+
+    /**
+     * Sets to indicate one LZMA symbol (literal, rep, or match).
+     */
+    void set1(int newPrice, int optCur, int back) {
+        price = newPrice;
+        optPrev = optCur;
+        backPrev = back;
+        prev1IsLiteral = false;
+    }
+
+    /**
+     * Sets to indicate two LZMA symbols of which the first one is a literal.
+     */
+    void set2(int newPrice, int optCur, int back) {
+        price = newPrice;
+        optPrev = optCur + 1;
+        backPrev = back;
+        prev1IsLiteral = true;
+        hasPrev2 = false;
+    }
+
+    /**
+     * Sets to indicate three LZMA symbols of which the second one
+     * is a literal.
+     */
+    void set3(int newPrice, int optCur, int back2, int len2, int back) {
+        price = newPrice;
+        optPrev = optCur + len2 + 1;
+        backPrev = back;
+        prev1IsLiteral = true;
+        hasPrev2 = true;
+        optPrev2 = optCur;
+        backPrev2 = back2;
+    }
+}
diff --git a/src/org/tukaani/xz/lzma/State.java b/src/org/tukaani/xz/lzma/State.java
new file mode 100644
index 0000000..0ece860
--- /dev/null
+++ b/src/org/tukaani/xz/lzma/State.java
@@ -0,0 +1,75 @@
+/*
+ * State
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.lzma;
+
+final class State {
+    static final int STATES = 12;
+
+    private static final int LIT_STATES = 7;
+
+    private static final int LIT_LIT = 0;
+    private static final int MATCH_LIT_LIT = 1;
+    private static final int REP_LIT_LIT = 2;
+    private static final int SHORTREP_LIT_LIT = 3;
+    private static final int MATCH_LIT = 4;
+    private static final int REP_LIT = 5;
+    private static final int SHORTREP_LIT = 6;
+    private static final int LIT_MATCH = 7;
+    private static final int LIT_LONGREP = 8;
+    private static final int LIT_SHORTREP = 9;
+    private static final int NONLIT_MATCH = 10;
+    private static final int NONLIT_REP = 11;
+
+    private int state;
+
+    State() {}
+
+    State(State other) {
+        state = other.state;
+    }
+
+    void reset() {
+        state = LIT_LIT;
+    }
+
+    int get() {
+        return state;
+    }
+
+    void set(State other) {
+        state = other.state;
+    }
+
+    void updateLiteral() {
+        if (state <= SHORTREP_LIT_LIT)
+            state = LIT_LIT;
+        else if (state <= LIT_SHORTREP)
+            state -= 3;
+        else
+            state -= 6;
+    }
+
+    void updateMatch() {
+        state = state < LIT_STATES ? LIT_MATCH : NONLIT_MATCH;
+    }
+
+    void updateLongRep() {
+        state = state < LIT_STATES ? LIT_LONGREP : NONLIT_REP;
+    }
+
+    void updateShortRep() {
+        state = state < LIT_STATES ? LIT_SHORTREP : NONLIT_REP;
+    }
+
+    boolean isLiteral() {
+        return state < LIT_STATES;
+    }
+}
diff --git a/src/org/tukaani/xz/package-info.java b/src/org/tukaani/xz/package-info.java
new file mode 100644
index 0000000..4e961df
--- /dev/null
+++ b/src/org/tukaani/xz/package-info.java
@@ -0,0 +1,45 @@
+/*
+ * package-info
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+/**
+ * XZ data compression support.
+ *
+ * <h4>Introduction</h4>
+ * <p>
+ * This aims to be a complete implementation of XZ data compression
+ * in pure Java. Features:
+ * <ul>
+ * <li>Full support for the .xz file format specification version 1.0.4</li>
+ * <li>Single-threaded streamed compression and decompression</li>
+ * <li>Single-threaded decompression with limited random access support</li>
+ * <li>Raw streams (no .xz headers) for advanced users, including LZMA2
+ *     with preset dictionary</li>
+ * </ul>
+ * <p>
+ * Threading is planned but it is unknown when it will be implemented.
+ * <p>
+ * For the latest source code, see the
+ * <a href="http://tukaani.org/xz/java.html">home page of XZ for Java</a>.
+ *
+ * <h4>Getting started</h4>
+ * <p>
+ * Start by reading the documentation of {@link org.tukaani.xz.XZOutputStream}
+ * and {@link org.tukaani.xz.XZInputStream}.
+ * If you use XZ inside another file format or protocol,
+ * see also {@link org.tukaani.xz.SingleXZInputStream}.
+ *
+ * <h4>Licensing</h4>
+ * <p>
+ * XZ for Java has been put into the public domain, thus you can do
+ * whatever you want with it. All the files in the package have been
+ * written by Lasse Collin and/or Igor Pavlov.
+ * <p>
+ * This software is provided "as is", without any warranty.
+ */
+package org.tukaani.xz;
diff --git a/src/org/tukaani/xz/rangecoder/RangeCoder.java b/src/org/tukaani/xz/rangecoder/RangeCoder.java
new file mode 100644
index 0000000..df9b0c4
--- /dev/null
+++ b/src/org/tukaani/xz/rangecoder/RangeCoder.java
@@ -0,0 +1,26 @@
+/*
+ * RangeCoder
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.rangecoder;
+
+import java.util.Arrays;
+
+public abstract class RangeCoder {
+    static final int SHIFT_BITS = 8;
+    static final int TOP_MASK = 0xFF000000;
+    static final int BIT_MODEL_TOTAL_BITS = 11;
+    static final int BIT_MODEL_TOTAL = 1 << BIT_MODEL_TOTAL_BITS;
+    static final short PROB_INIT = (short)(BIT_MODEL_TOTAL / 2);
+    static final int MOVE_BITS = 5;
+
+    public static final void initProbs(short[] probs) {
+        Arrays.fill(probs, PROB_INIT);
+    }
+}
diff --git a/src/org/tukaani/xz/rangecoder/RangeDecoder.java b/src/org/tukaani/xz/rangecoder/RangeDecoder.java
new file mode 100644
index 0000000..e63532e
--- /dev/null
+++ b/src/org/tukaani/xz/rangecoder/RangeDecoder.java
@@ -0,0 +1,83 @@
+/*
+ * RangeDecoder
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.rangecoder;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+
+public abstract class RangeDecoder extends RangeCoder {
+    int range = 0;
+    int code = 0;
+
+    public abstract void normalize() throws IOException;
+
+    public int decodeBit(short[] probs, int index) throws IOException {
+        normalize();
+
+        int prob = probs[index];
+        int bound = (range >>> BIT_MODEL_TOTAL_BITS) * prob;
+        int bit;
+
+        // Compare code and bound as if they were unsigned 32-bit integers.
+        if ((code ^ 0x80000000) < (bound ^ 0x80000000)) {
+            range = bound;
+            probs[index] = (short)(
+                    prob + ((BIT_MODEL_TOTAL - prob) >>> MOVE_BITS));
+            bit = 0;
+        } else {
+            range -= bound;
+            code -= bound;
+            probs[index] = (short)(prob - (prob >>> MOVE_BITS));
+            bit = 1;
+        }
+
+        return bit;
+    }
+
+    public int decodeBitTree(short[] probs) throws IOException {
+        int symbol = 1;
+
+        do {
+            symbol = (symbol << 1) | decodeBit(probs, symbol);
+        } while (symbol < probs.length);
+
+        return symbol - probs.length;
+    }
+
+    public int decodeReverseBitTree(short[] probs) throws IOException {
+        int symbol = 1;
+        int i = 0;
+        int result = 0;
+
+        do {
+            int bit = decodeBit(probs, symbol);
+            symbol = (symbol << 1) | bit;
+            result |= bit << i++;
+        } while (symbol < probs.length);
+
+        return result;
+    }
+
+    public int decodeDirectBits(int count) throws IOException {
+        int result = 0;
+
+        do {
+            normalize();
+
+            range >>>= 1;
+            int t = (code - range) >>> 31;
+            code -= range & (t - 1);
+            result = (result << 1) | (1 - t);
+        } while (--count != 0);
+
+        return result;
+    }
+}
diff --git a/src/org/tukaani/xz/rangecoder/RangeDecoderFromBuffer.java b/src/org/tukaani/xz/rangecoder/RangeDecoderFromBuffer.java
new file mode 100644
index 0000000..dd2f7cc
--- /dev/null
+++ b/src/org/tukaani/xz/rangecoder/RangeDecoderFromBuffer.java
@@ -0,0 +1,71 @@
+/*
+ * RangeDecoderFromBuffer
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.rangecoder;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import org.tukaani.xz.ArrayCache;
+import org.tukaani.xz.CorruptedInputException;
+
+public final class RangeDecoderFromBuffer extends RangeDecoder {
+    private static final int INIT_SIZE = 5;
+
+    private final byte[] buf;
+    private int pos;
+
+    public RangeDecoderFromBuffer(int inputSizeMax, ArrayCache arrayCache) {
+        // We will use the *end* of the array so if the cache gives us
+        // a bigger-than-requested array, we still want to use buf.length.
+        buf = arrayCache.getByteArray(inputSizeMax - INIT_SIZE, false);
+        pos = buf.length;
+    }
+
+    public void putArraysToCache(ArrayCache arrayCache) {
+        arrayCache.putArray(buf);
+    }
+
+    public void prepareInputBuffer(DataInputStream in, int len)
+            throws IOException {
+        if (len < INIT_SIZE)
+            throw new CorruptedInputException();
+
+        if (in.readUnsignedByte() != 0x00)
+            throw new CorruptedInputException();
+
+        code = in.readInt();
+        range = 0xFFFFFFFF;
+
+        // Read the data to the end of the buffer. If the data is corrupt
+        // and the decoder, reading from buf, tries to read past the end of
+        // the data, ArrayIndexOutOfBoundsException will be thrown and
+        // the problem is detected immediately.
+        len -= INIT_SIZE;
+        pos = buf.length - len;
+        in.readFully(buf, pos, len);
+    }
+
+    public boolean isFinished() {
+        return pos == buf.length && code == 0;
+    }
+
+    public void normalize() throws IOException {
+        if ((range & TOP_MASK) == 0) {
+            try {
+                // If the input is corrupt, this might throw
+                // ArrayIndexOutOfBoundsException.
+                code = (code << SHIFT_BITS) | (buf[pos++] & 0xFF);
+                range <<= SHIFT_BITS;
+            } catch (ArrayIndexOutOfBoundsException e) {
+                throw new CorruptedInputException();
+            }
+        }
+    }
+}
diff --git a/src/org/tukaani/xz/rangecoder/RangeEncoder.java b/src/org/tukaani/xz/rangecoder/RangeEncoder.java
new file mode 100644
index 0000000..daa84a3
--- /dev/null
+++ b/src/org/tukaani/xz/rangecoder/RangeEncoder.java
@@ -0,0 +1,200 @@
+/*
+ * RangeEncoder
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.rangecoder;
+
+import java.io.IOException;
+
+public abstract class RangeEncoder extends RangeCoder {
+    private static final int MOVE_REDUCING_BITS = 4;
+    private static final int BIT_PRICE_SHIFT_BITS = 4;
+
+    private static final int[] prices
+            = new int[BIT_MODEL_TOTAL >>> MOVE_REDUCING_BITS];
+
+    private long low;
+    private int range;
+
+    // NOTE: int is OK for LZMA2 because a compressed chunk
+    // is not more than 64 KiB, but with LZMA1 there is no chunking
+    // so in theory cacheSize can grow very big. To be very safe,
+    // use long instead of int since this code is used for LZMA1 too.
+    long cacheSize;
+    private byte cache;
+
+    static {
+        for (int i = (1 << MOVE_REDUCING_BITS) / 2; i < BIT_MODEL_TOTAL;
+                i += (1 << MOVE_REDUCING_BITS)) {
+            int w = i;
+            int bitCount = 0;
+
+            for (int j = 0; j < BIT_PRICE_SHIFT_BITS; ++j) {
+                w *= w;
+                bitCount <<= 1;
+
+                while ((w & 0xFFFF0000) != 0) {
+                    w >>>= 1;
+                    ++bitCount;
+                }
+            }
+
+            prices[i >> MOVE_REDUCING_BITS]
+                    = (BIT_MODEL_TOTAL_BITS << BIT_PRICE_SHIFT_BITS)
+                      - 15 - bitCount;
+        }
+    }
+
+    public void reset() {
+        low = 0;
+        range = 0xFFFFFFFF;
+        cache = 0x00;
+        cacheSize = 1;
+    }
+
+    public int getPendingSize() {
+        // This function is only needed by users of RangeEncoderToBuffer,
+        // but providing a must-be-never-called version here makes
+        // LZMAEncoder simpler.
+        throw new Error();
+    }
+
+    public int finish() throws IOException {
+        for (int i = 0; i < 5; ++i)
+            shiftLow();
+
+        // RangeEncoderToBuffer.finish() needs a return value to tell
+        // how big the finished buffer is. RangeEncoderToStream has no
+        // buffer and thus no return value is needed. Here we use a dummy
+        // value which can be overriden in RangeEncoderToBuffer.finish().
+        return -1;
+    }
+
+    abstract void writeByte(int b) throws IOException;
+
+    private void shiftLow() throws IOException {
+        int lowHi = (int)(low >>> 32);
+
+        if (lowHi != 0 || low < 0xFF000000L) {
+            int temp = cache;
+
+            do {
+                writeByte(temp + lowHi);
+                temp = 0xFF;
+            } while (--cacheSize != 0);
+
+            cache = (byte)(low >>> 24);
+        }
+
+        ++cacheSize;
+        low = (low & 0x00FFFFFF) << 8;
+    }
+
+    public void encodeBit(short[] probs, int index, int bit)
+            throws IOException {
+        int prob = probs[index];
+        int bound = (range >>> BIT_MODEL_TOTAL_BITS) * prob;
+
+        // NOTE: Any non-zero value for bit is taken as 1.
+        if (bit == 0) {
+            range = bound;
+            probs[index] = (short)(
+                    prob + ((BIT_MODEL_TOTAL - prob) >>> MOVE_BITS));
+        } else {
+            low += bound & 0xFFFFFFFFL;
+            range -= bound;
+            probs[index] = (short)(prob - (prob >>> MOVE_BITS));
+        }
+
+        if ((range & TOP_MASK) == 0) {
+            range <<= SHIFT_BITS;
+            shiftLow();
+        }
+    }
+
+    public static int getBitPrice(int prob, int bit) {
+        // NOTE: Unlike in encodeBit(), here bit must be 0 or 1.
+        assert bit == 0 || bit == 1;
+        return prices[(prob ^ ((-bit) & (BIT_MODEL_TOTAL - 1)))
+                      >>> MOVE_REDUCING_BITS];
+    }
+
+    public void encodeBitTree(short[] probs, int symbol) throws IOException {
+        int index = 1;
+        int mask = probs.length;
+
+        do {
+            mask >>>= 1;
+            int bit = symbol & mask;
+            encodeBit(probs, index, bit);
+
+            index <<= 1;
+            if (bit != 0)
+                index |= 1;
+
+        } while (mask != 1);
+    }
+
+    public static int getBitTreePrice(short[] probs, int symbol) {
+        int price = 0;
+        symbol |= probs.length;
+
+        do {
+            int bit = symbol & 1;
+            symbol >>>= 1;
+            price += getBitPrice(probs[symbol], bit);
+        } while (symbol != 1);
+
+        return price;
+    }
+
+    public void encodeReverseBitTree(short[] probs, int symbol)
+            throws IOException {
+        int index = 1;
+        symbol |= probs.length;
+
+        do {
+            int bit = symbol & 1;
+            symbol >>>= 1;
+            encodeBit(probs, index, bit);
+            index = (index << 1) | bit;
+        } while (symbol != 1);
+    }
+
+    public static int getReverseBitTreePrice(short[] probs, int symbol) {
+        int price = 0;
+        int index = 1;
+        symbol |= probs.length;
+
+        do {
+            int bit = symbol & 1;
+            symbol >>>= 1;
+            price += getBitPrice(probs[index], bit);
+            index = (index << 1) | bit;
+        } while (symbol != 1);
+
+        return price;
+    }
+
+    public void encodeDirectBits(int value, int count) throws IOException {
+        do {
+            range >>>= 1;
+            low += range & (0 - ((value >>> --count) & 1));
+
+            if ((range & TOP_MASK) == 0) {
+                range <<= SHIFT_BITS;
+                shiftLow();
+            }
+        } while (count != 0);
+    }
+
+    public static int getDirectBitsPrice(int count) {
+        return count << BIT_PRICE_SHIFT_BITS;
+    }
+}
diff --git a/src/org/tukaani/xz/rangecoder/RangeEncoderToBuffer.java b/src/org/tukaani/xz/rangecoder/RangeEncoderToBuffer.java
new file mode 100644
index 0000000..aee2e3d
--- /dev/null
+++ b/src/org/tukaani/xz/rangecoder/RangeEncoderToBuffer.java
@@ -0,0 +1,59 @@
+/*
+ * RangeEncoderToBuffer
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.rangecoder;
+
+import java.io.OutputStream;
+import java.io.IOException;
+import org.tukaani.xz.ArrayCache;
+
+public final class RangeEncoderToBuffer extends RangeEncoder {
+    private final byte[] buf;
+    private int bufPos;
+
+    public RangeEncoderToBuffer(int bufSize, ArrayCache arrayCache) {
+        buf = arrayCache.getByteArray(bufSize, false);
+        reset();
+    }
+
+    public void putArraysToCache(ArrayCache arrayCache) {
+        arrayCache.putArray(buf);
+    }
+
+    public void reset() {
+        super.reset();
+        bufPos = 0;
+    }
+
+    public int getPendingSize() {
+        // With LZMA2 it is known that cacheSize fits into an int.
+        return bufPos + (int)cacheSize + 5 - 1;
+    }
+
+    public int finish() {
+        // super.finish() cannot throw an IOException because writeByte()
+        // provided in this file cannot throw an IOException.
+        try {
+            super.finish();
+        } catch (IOException e) {
+            throw new Error();
+        }
+
+        return bufPos;
+    }
+
+    public void write(OutputStream out) throws IOException {
+        out.write(buf, 0, bufPos);
+    }
+
+    void writeByte(int b) {
+        buf[bufPos++] = (byte)b;
+    }
+}
diff --git a/src/org/tukaani/xz/simple/ARM.java b/src/org/tukaani/xz/simple/ARM.java
new file mode 100644
index 0000000..6febf78
--- /dev/null
+++ b/src/org/tukaani/xz/simple/ARM.java
@@ -0,0 +1,50 @@
+/*
+ * BCJ filter for little endian ARM instructions
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.simple;
+
+public final class ARM implements SimpleFilter {
+    private final boolean isEncoder;
+    private int pos;
+
+    public ARM(boolean isEncoder, int startPos) {
+        this.isEncoder = isEncoder;
+        pos = startPos + 8;
+    }
+
+    public int code(byte[] buf, int off, int len) {
+        int end = off + len - 4;
+        int i;
+
+        for (i = off; i <= end; i += 4) {
+            if ((buf[i + 3] & 0xFF) == 0xEB) {
+                int src = ((buf[i + 2] & 0xFF) << 16)
+                          | ((buf[i + 1] & 0xFF) << 8)
+                          | (buf[i] & 0xFF);
+                src <<= 2;
+
+                int dest;
+                if (isEncoder)
+                    dest = src + (pos + i - off);
+                else
+                    dest = src - (pos + i - off);
+
+                dest >>>= 2;
+                buf[i + 2] = (byte)(dest >>> 16);
+                buf[i + 1] = (byte)(dest >>> 8);
+                buf[i] = (byte)dest;
+            }
+        }
+
+        i -= off;
+        pos += i;
+        return i;
+    }
+}
diff --git a/src/org/tukaani/xz/simple/ARMThumb.java b/src/org/tukaani/xz/simple/ARMThumb.java
new file mode 100644
index 0000000..b8e7ca9
--- /dev/null
+++ b/src/org/tukaani/xz/simple/ARMThumb.java
@@ -0,0 +1,53 @@
+/*
+ * BCJ filter for little endian ARM-Thumb instructions
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.simple;
+
+public final class ARMThumb implements SimpleFilter {
+    private final boolean isEncoder;
+    private int pos;
+
+    public ARMThumb(boolean isEncoder, int startPos) {
+        this.isEncoder = isEncoder;
+        pos = startPos + 4;
+    }
+
+    public int code(byte[] buf, int off, int len) {
+        int end = off + len - 4;
+        int i;
+
+        for (i = off; i <= end; i += 2) {
+            if ((buf[i + 1] & 0xF8) == 0xF0 && (buf[i + 3] & 0xF8) == 0xF8) {
+                int src = ((buf[i + 1] & 0x07) << 19)
+                          | ((buf[i] & 0xFF) << 11)
+                          | ((buf[i + 3] & 0x07) << 8)
+                          | (buf[i + 2] & 0xFF);
+                src <<= 1;
+
+                int dest;
+                if (isEncoder)
+                    dest = src + (pos + i - off);
+                else
+                    dest = src - (pos + i - off);
+
+                dest >>>= 1;
+                buf[i + 1] = (byte)(0xF0 | ((dest >>> 19) & 0x07));
+                buf[i] = (byte)(dest >>> 11);
+                buf[i + 3] = (byte)(0xF8 | ((dest >>> 8) & 0x07));
+                buf[i + 2] = (byte)dest;
+                i += 2;
+            }
+        }
+
+        i -= off;
+        pos += i;
+        return i;
+    }
+}
diff --git a/src/org/tukaani/xz/simple/IA64.java b/src/org/tukaani/xz/simple/IA64.java
new file mode 100644
index 0000000..776a1b7
--- /dev/null
+++ b/src/org/tukaani/xz/simple/IA64.java
@@ -0,0 +1,81 @@
+/*
+ * BCJ filter for Itanium (IA-64) instructions
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.simple;
+
+public final class IA64 implements SimpleFilter {
+    private static final int[] BRANCH_TABLE = {
+            0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0,
+            4, 4, 6, 6, 0, 0, 7, 7,
+            4, 4, 0, 0, 4, 4, 0, 0 };
+
+    private final boolean isEncoder;
+    private int pos;
+
+    public IA64(boolean isEncoder, int startPos) {
+        this.isEncoder = isEncoder;
+        pos = startPos;
+    }
+
+    public int code(byte[] buf, int off, int len) {
+        int end = off + len - 16;
+        int i;
+
+        for (i = off; i <= end; i += 16) {
+            int instrTemplate = buf[i] & 0x1F;
+            int mask = BRANCH_TABLE[instrTemplate];
+
+            for (int slot = 0, bitPos = 5; slot < 3; ++slot, bitPos += 41) {
+                if (((mask >>> slot) & 1) == 0)
+                    continue;
+
+                int bytePos = bitPos >>> 3;
+                int bitRes = bitPos & 7;
+
+                long instr = 0;
+                for (int j = 0; j < 6; ++j)
+                    instr |= (buf[i + bytePos + j] & 0xFFL) << (8 * j);
+
+                long instrNorm = instr >>> bitRes;
+
+                if (((instrNorm >>> 37) & 0x0F) != 0x05
+                        || ((instrNorm >>> 9) & 0x07) != 0x00)
+                    continue;
+
+                int src = (int)((instrNorm >>> 13) & 0x0FFFFF);
+                src |= ((int)(instrNorm >>> 36) & 1) << 20;
+                src <<= 4;
+
+                int dest;
+                if (isEncoder)
+                    dest = src + (pos + i - off);
+                else
+                    dest = src - (pos + i - off);
+
+                dest >>>= 4;
+
+                instrNorm &= ~(0x8FFFFFL << 13);
+                instrNorm |= (dest & 0x0FFFFFL) << 13;
+                instrNorm |= (dest & 0x100000L) << (36 - 20);
+
+                instr &= (1 << bitRes) - 1;
+                instr |= instrNorm << bitRes;
+
+                for (int j = 0; j < 6; ++j)
+                    buf[i + bytePos + j] = (byte)(instr >>> (8 * j));
+            }
+        }
+
+        i -= off;
+        pos += i;
+        return i;
+    }
+}
diff --git a/src/org/tukaani/xz/simple/PowerPC.java b/src/org/tukaani/xz/simple/PowerPC.java
new file mode 100644
index 0000000..b7400ab
--- /dev/null
+++ b/src/org/tukaani/xz/simple/PowerPC.java
@@ -0,0 +1,50 @@
+/*
+ * BCJ filter for big endian PowerPC instructions
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.simple;
+
+public final class PowerPC implements SimpleFilter {
+    private final boolean isEncoder;
+    private int pos;
+
+    public PowerPC(boolean isEncoder, int startPos) {
+        this.isEncoder = isEncoder;
+        pos = startPos;
+    }
+
+    public int code(byte[] buf, int off, int len) {
+        int end = off + len - 4;
+        int i;
+
+        for (i = off; i <= end; i += 4) {
+            if ((buf[i] & 0xFC) == 0x48 && (buf[i + 3] & 0x03) == 0x01) {
+                int src = ((buf[i] & 0x03) << 24)
+                          | ((buf[i + 1] & 0xFF) << 16)
+                          | ((buf[i + 2] & 0xFF) << 8)
+                          | (buf[i + 3] & 0xFC);
+
+                int dest;
+                if (isEncoder)
+                    dest = src + (pos + i - off);
+                else
+                    dest = src - (pos + i - off);
+
+                buf[i] = (byte)(0x48 | ((dest >>> 24) & 0x03));
+                buf[i + 1] = (byte)(dest >>> 16);
+                buf[i + 2] = (byte)(dest >>> 8);
+                buf[i + 3] = (byte)((buf[i + 3] & 0x03) | dest);
+            }
+        }
+
+        i -= off;
+        pos += i;
+        return i;
+    }
+}
diff --git a/src/org/tukaani/xz/simple/SPARC.java b/src/org/tukaani/xz/simple/SPARC.java
new file mode 100644
index 0000000..913c8ac
--- /dev/null
+++ b/src/org/tukaani/xz/simple/SPARC.java
@@ -0,0 +1,56 @@
+/*
+ * BCJ filter for SPARC instructions
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.simple;
+
+public final class SPARC implements SimpleFilter {
+    private final boolean isEncoder;
+    private int pos;
+
+    public SPARC(boolean isEncoder, int startPos) {
+        this.isEncoder = isEncoder;
+        pos = startPos;
+    }
+
+    public int code(byte[] buf, int off, int len) {
+        int end = off + len - 4;
+        int i;
+
+        for (i = off; i <= end; i += 4) {
+            if ((buf[i] == 0x40 && (buf[i + 1] & 0xC0) == 0x00)
+                    || (buf[i] == 0x7F && (buf[i + 1] & 0xC0) == 0xC0)) {
+                int src = ((buf[i] & 0xFF) << 24)
+                          | ((buf[i + 1] & 0xFF) << 16)
+                          | ((buf[i + 2] & 0xFF) << 8)
+                          | (buf[i + 3] & 0xFF);
+                src <<= 2;
+
+                int dest;
+                if (isEncoder)
+                    dest = src + (pos + i - off);
+                else
+                    dest = src - (pos + i - off);
+
+                dest >>>= 2;
+                dest = (((0 - ((dest >>> 22) & 1)) << 22) & 0x3FFFFFFF)
+                       | (dest & 0x3FFFFF) | 0x40000000;
+
+                buf[i] = (byte)(dest >>> 24);
+                buf[i + 1] = (byte)(dest >>> 16);
+                buf[i + 2] = (byte)(dest >>> 8);
+                buf[i + 3] = (byte)dest;
+            }
+        }
+
+        i -= off;
+        pos += i;
+        return i;
+    }
+}
diff --git a/src/org/tukaani/xz/simple/SimpleFilter.java b/src/org/tukaani/xz/simple/SimpleFilter.java
new file mode 100644
index 0000000..6f72906
--- /dev/null
+++ b/src/org/tukaani/xz/simple/SimpleFilter.java
@@ -0,0 +1,14 @@
+/*
+ * BCJ filter for little endian ARM instructions
+ *
+ * Author: Lasse Collin <lasse.collin at tukaani.org>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.simple;
+
+public interface SimpleFilter {
+    int code(byte[] buf, int off, int len);
+}
diff --git a/src/org/tukaani/xz/simple/X86.java b/src/org/tukaani/xz/simple/X86.java
new file mode 100644
index 0000000..a05e08b
--- /dev/null
+++ b/src/org/tukaani/xz/simple/X86.java
@@ -0,0 +1,98 @@
+/*
+ * BCJ filter for x86 instructions
+ *
+ * Authors: Lasse Collin <lasse.collin at tukaani.org>
+ *          Igor Pavlov <http://7-zip.org/>
+ *
+ * This file has been put into the public domain.
+ * You can do whatever you want with this file.
+ */
+
+package org.tukaani.xz.simple;
+
+public final class X86 implements SimpleFilter {
+    private static final boolean[] MASK_TO_ALLOWED_STATUS
+            = {true, true, true, false, true, false, false, false};
+
+    private static final int[] MASK_TO_BIT_NUMBER = {0, 1, 2, 2, 3, 3, 3, 3};
+
+    private final boolean isEncoder;
+    private int pos;
+    private int prevMask = 0;
+
+    private static boolean test86MSByte(byte b) {
+        int i = b & 0xFF;
+        return i == 0x00 || i == 0xFF;
+    }
+
+    public X86(boolean isEncoder, int startPos) {
+        this.isEncoder = isEncoder;
+        pos = startPos + 5;
+    }
+
+    public int code(byte[] buf, int off, int len) {
+        int prevPos = off - 1;
+        int end = off + len - 5;
+        int i;
+
+        for (i = off; i <= end; ++i) {
+            if ((buf[i] & 0xFE) != 0xE8)
+                continue;
+
+            prevPos = i - prevPos;
+            if ((prevPos & ~3) != 0) { // (unsigned)prevPos > 3
+                prevMask = 0;
+            } else {
+                prevMask = (prevMask << (prevPos - 1)) & 7;
+                if (prevMask != 0) {
+                    if (!MASK_TO_ALLOWED_STATUS[prevMask] || test86MSByte(
+                            buf[i + 4 - MASK_TO_BIT_NUMBER[prevMask]])) {
+                        prevPos = i;
+                        prevMask = (prevMask << 1) | 1;
+                        continue;
+                    }
+                }
+            }
+
+            prevPos = i;
+
+            if (test86MSByte(buf[i + 4])) {
+                int src = (buf[i + 1] & 0xFF)
+                          | ((buf[i + 2] & 0xFF) << 8)
+                          | ((buf[i + 3] & 0xFF) << 16)
+                          | ((buf[i + 4] & 0xFF) << 24);
+                int dest;
+                while (true) {
+                    if (isEncoder)
+                        dest = src + (pos + i - off);
+                    else
+                        dest = src - (pos + i - off);
+
+                    if (prevMask == 0)
+                        break;
+
+                    int index = MASK_TO_BIT_NUMBER[prevMask] * 8;
+                    if (!test86MSByte((byte)(dest >>> (24 - index))))
+                        break;
+
+                    src = dest ^ ((1 << (32 - index)) - 1);
+                }
+
+                buf[i + 1] = (byte)dest;
+                buf[i + 2] = (byte)(dest >>> 8);
+                buf[i + 3] = (byte)(dest >>> 16);
+                buf[i + 4] = (byte)(~(((dest >>> 24) & 1) - 1));
+                i += 4;
+            } else {
+                prevMask = (prevMask << 1) | 1;
+            }
+        }
+
+        prevPos = i - prevPos;
+        prevMask = ((prevPos & ~3) != 0) ? 0 : prevMask << (prevPos - 1);
+
+        i -= off;
+        pos += i;
+        return i;
+    }
+}
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index 2329d3f..0eed6e4 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -35,6 +35,12 @@ setting::shrink_nodes {
   default: true;
 }
 
+setting::hide_tagged_waynodes {
+  type: boolean;
+  label: tr("Hide tagged waynodes at low zoom");
+  default: true;
+}
+
 setting::highway_labels {
   type: boolean;
   label: tr("Display street labels (at high zoom)");
@@ -4680,6 +4686,7 @@ node|z-15[note][FIXME][!setting("hide_icons")]::core_note_fixme {
 /*
 Summary of different zoom levels:
   (any zoom)    place=* (except locality) and a few natural icons with their text is shown
+  |z-14         tagged way nodes are hidden completely
   |z-15         untagged way nodes are hidden completely
   |z15          place=locality icon
   |z16-         fixme=* and note=* symbols; place=locality text
@@ -4688,6 +4695,7 @@ Summary of different zoom levels:
   |z18-         text for normal POI icons is shown
   
  * text size and node size is adapted according to zoom level (see style source below), place labels (except locality) don't get smaller
+ * all these zoom features are modifiable via style settings
  * maxspeed icons should not be distinguishable from POIs with "icon-image" property
 
 */
@@ -4710,6 +4718,9 @@ node:tagged {
     symbol-stroke-color: none;
     symbol-fill-color: node_tagged#00ffff;
 }
+way > node|z-14[setting("shrink_nodes")][setting("hide_tagged_waynodes")]:tagged { /* todo: check which is faster: `way > node {...}` or `node!:unconnected {...}`, also at other occurrences in this file */
+    symbol-shape: none;
+}
 
 way > node|z16[setting("shrink_nodes")]!:tagged { symbol-size: 1; }
 
diff --git a/test/data/plugin/corrupted_plugin.MANIFEST.MF b/test/data/plugin/corrupted_plugin.MANIFEST.MF
new file mode 100644
index 0000000..af5e4ee
--- /dev/null
+++ b/test/data/plugin/corrupted_plugin.MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.10.1
+Created-By: 1.8.0_152-b16 (Oracle Corporation)
+Plugin-Mainversion: 7654
+Plugin-Version: 5432
+Plugin-Class: org.openstreetmap.josm.plugin.corrupted.CorruptedPlugin
+Plugin-Description: A plugin whose download gets corrupted.
+Plugin-Date: 2017-06-01T12:34:56.789012Z
+Author: Example Author <author at example.com>
+Plugin-Link: https://example.com/corrupted-plugin
+Plugin-Icon: images/preferences/corrupted.png
+Plugin-Canloadatruntime: false
diff --git a/test/data/regress/15730/capabilities.xml b/test/data/regress/15730/capabilities.xml
new file mode 100644
index 0000000..b43e226
--- /dev/null
+++ b/test/data/regress/15730/capabilities.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE WMT_MS_Capabilities SYSTEM "http://schemas.opengis.net/wms/1.1.1/WMS_MS_Capabilities.dtd">
+<WMT_MS_Capabilities version="1.1.1">
+  <Service>
+    <Name>WMS</Name>
+    <Title>OGC:WMS</Title>
+    <Abstract>OGC:WMS</Abstract>
+    <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="https://gis.apfo.usda.gov/arcgis/services/NAIP/South_Carolina/ImageServer/WMSServer"/>
+    <ContactInformation>
+      <ContactPersonPrimary>
+      </ContactPersonPrimary>
+      <ContactAddress>
+      </ContactAddress>
+    </ContactInformation>
+  </Service>
+  <Capability>
+    <Request>
+      <GetCapabilities>
+        <Format>application/vnd.ogc.wms_xml</Format>
+        <DCPType>
+          <HTTP><Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="https://gis.apfo.usda.gov/arcgis/services/NAIP/South_Carolina/ImageServer/WMSServer"/></Get></HTTP>
+        </DCPType>
+      </GetCapabilities>
+      <GetMap>
+        <Format>image/tiff</Format>
+        <Format>image/png</Format>
+        <Format>image/png24</Format>
+        <Format>image/png32</Format>
+        <Format>image/bmp</Format>
+        <Format>image/jpeg</Format>
+        <Format>image/svg</Format>
+        <DCPType>
+          <HTTP><Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="https://gis.apfo.usda.gov/arcgis/services/NAIP/South_Carolina/ImageServer/WMSServer"/></Get></HTTP>
+        </DCPType>
+      </GetMap>
+      <GetStyles>
+        <Format>application/vnd.ogc.sld+xml</Format>
+        <DCPType>
+          <HTTP><Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="https://gis.apfo.usda.gov/arcgis/services/NAIP/South_Carolina/ImageServer/WMSServer"/></Get></HTTP>
+        </DCPType>
+      </GetStyles>
+    </Request>
+    <Exception>
+      <Format>application/vnd.ogc.se_xml</Format>
+      <Format>application/vnd.ogc.se_inimage</Format>
+      <Format>application/vnd.ogc.se_blank</Format>
+    </Exception>
+    <Layer>
+    <Name>0</Name>
+      <Title>South_Carolina</Title>
+      <Abstract>South Carolina  NAIP Imagery 2017    Resolution: 100CM 
+<br/>
+<br/>
+<b>DATA IDENTFICATION </b><br/>
+Abstract: The NAIP National Metadata Map contains USGS Quarter Quad and NAIP Seamline boundaries for every year NAIP imagery has been collected. Clicking on the map also makes available a number of metadata fields which describe the day, time, camera, aircraft, and location of NAIP collection. There is also a link which will open an FGDC compliant metadata text file for each NAIP USGS Quarter Quad collected.
+<br/>
+Purpose: To make additional information and metadata about NAIP available to the public.
+<br/>
+Language: eng; USA
+<br/>
+Browse Graphic: http://www.arcgis.com/sharing/rest/content/items/d7eb04e3a14343b39cdc3503f5037003/info/thumbnail/NAIPnationalmetadata.jpg
+Browse Graphic Type: JPEG
+Browse Graphic Caption: ArcGIS Online REST endpoint content
+<br/>
+<br/>
+<b>POINT OF CONTACT </b><br/>
+Organization Name: USDA-FSA-APFO Aerial Photography Field Office<br/>
+Role: Point Of Contact<br/>
+Voice: 801-844-2900<br/>
+Delivery Point: 2222 West 2300 South<br/>
+City: Salt Lake City<br/>
+Administrative Area: Utah<br/>
+Postal Code: 84119-2020<br/>
+Web: https://catalog.data.gov/dataset/naip-national-metadata <br/>
+Country: USA<br/>
+E-Mail Address: apfo.sales at slc.usda.gov<br/></Abstract>
+<SRS>EPSG:4326</SRS>
+<SRS>EPSG:0</SRS>
+<LatLonBoundingBox minx="-83.375029" miny="31.999971" maxx="-78.499971" maxy="35.250026"/>
+<BoundingBox SRS="EPSG:4326" minx="-83.375029" miny="31.999971" maxx="-78.499971" maxy="35.250026"/>
+<BoundingBox SRS="EPSG:0" minx="-9281265.763300" miny="3763306.812100" maxx="-8738576.763300" maxy="4197910.812100"/>
+<Dimension name="time" units="ISO8601" />
+<Extent name="time" default="2017Z">2017Z/2017Z/P1Y</Extent>
+    </Layer>
+  </Capability>
+</WMT_MS_Capabilities>
diff --git a/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java b/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
index 94e6250..002d98a 100644
--- a/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
+++ b/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
@@ -4,7 +4,9 @@ package org.openstreetmap.josm.tools;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -14,6 +16,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
+import java.util.regex.Matcher;
 
 import javax.json.JsonObject;
 import javax.json.JsonReader;
@@ -297,4 +300,27 @@ public class HttpClientTest {
             Assert.assertTrue(x.readLine().startsWith("<?xml version="));
         }
     }
+
+    /**
+     * Test that error message sent by Tomcat can be parsed.
+     */
+    @Test
+    public void testTomcatErrorMessage() {
+        Matcher m = HttpClient.getTomcatErrorMatcher(
+            "<html><head><title>Apache Tomcat/DGFiP - Rapport d''erreur</title><style><!--"+
+                "H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;} "+
+                "H2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;} "+
+                "H3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;} "+
+                "BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;} "+
+                "B {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;} "+
+                "P {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}"+
+                "A {color : black;}A.name {color : black;}HR {color : #525D76;}"+
+            "--></style> </head><body><h1>Etat HTTP 400 - La commune demandée n'existe pas ou n'est pas accessible.</h1>"+
+            "<HR size=\"1\" noshade=\"noshade\">"+
+            "<p><b>type</b> Rapport d''état</p><p><b>message</b> <u>La commune demandée n'existe pas ou n'est pas accessible.</u></p>"+
+            "<p><b>description</b> <u>La requête envoyée par le client était syntaxiquement incorrecte.</u></p>"+
+            "<HR size=\"1\" noshade=\"noshade\"><h3>Apache Tomcat/DGFiP</h3></body></html>");
+        assertTrue(m.matches());
+        assertEquals("La commune demandée n'existe pas ou n'est pas accessible.", m.group(1));
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/TestUtils.java b/test/unit/org/openstreetmap/josm/TestUtils.java
index 050d7de..28282cf 100644
--- a/test/unit/org/openstreetmap/josm/TestUtils.java
+++ b/test/unit/org/openstreetmap/josm/TestUtils.java
@@ -187,6 +187,22 @@ public final class TestUtils {
     }
 
     /**
+     * Sets a private static field value.
+     * @param cls object class
+     * @param fieldName private field name
+     * @param value replacement value
+     * @throws ReflectiveOperationException if a reflection operation error occurs
+     */
+    public static void setPrivateStaticField(Class<?> cls, String fieldName, final Object value) throws ReflectiveOperationException {
+        Field f = cls.getDeclaredField(fieldName);
+        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+            f.setAccessible(true);
+            return null;
+        });
+        f.set(null, value);
+    }
+
+    /**
      * Returns an instance of {@link AbstractProgressMonitor} which keeps track of the monitor state,
      * but does not show the progress.
      * @return a progress monitor
diff --git a/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java b/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java
index f9fb636..57a736f 100644
--- a/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java
@@ -8,7 +8,6 @@ import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.actions.ExtensionFileFilter.AddArchiveExtension;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
 
 /**
  * Unit tests for class {@link ExtensionFileFilter}.
@@ -30,13 +29,17 @@ public class ExtensionFileFilterTest {
     @Test
     public void testNewFilterWithArchiveExtensions() {
         test("ext1", "ext1", "description", true,
-                "ext1,ext1.gz,ext1.bz2", "description (*.ext1, *.ext1.gz, *.ext1.bz2)");
+                "ext1,ext1.gz,ext1.bz,ext1.bz2,ext1.xz,ext1.zip",
+                "description (*.ext1, *.ext1.gz, *.ext1.bz, *.ext1.bz2, *.ext1.xz, *.ext1.zip)");
         test("ext1", "ext1", "description", false,
-                "ext1,ext1.gz,ext1.bz2", "description (*.ext1)");
+                "ext1,ext1.gz,ext1.bz,ext1.bz2,ext1.xz,ext1.zip", "description (*.ext1)");
         test("ext1,ext2", "ext1", "description", true,
-                "ext1,ext1.gz,ext1.bz2,ext2,ext2.gz,ext2.bz2", "description (*.ext1, *.ext1.gz, *.ext1.bz2, *.ext2, *.ext2.gz, *.ext2.bz2)");
+                "ext1,ext1.gz,ext1.bz,ext1.bz2,ext1.xz,ext1.zip,ext2,ext2.gz,ext2.bz,ext2.bz2,ext2.xz,ext2.zip",
+                "description (*.ext1, *.ext1.gz, *.ext1.bz, *.ext1.bz2, *.ext1.xz, *.ext1.zip, " +
+                             "*.ext2, *.ext2.gz, *.ext2.bz, *.ext2.bz2, *.ext2.xz, *.ext2.zip)");
         test("ext1,ext2", "ext1", "description", false,
-                "ext1,ext1.gz,ext1.bz2,ext2,ext2.gz,ext2.bz2", "description (*.ext1, *.ext2)");
+                "ext1,ext1.gz,ext1.bz,ext1.bz2,ext1.xz,ext1.zip,ext2,ext2.gz,ext2.bz,ext2.bz2,ext2.xz,ext2.zip",
+                "description (*.ext1, *.ext2)");
     }
 
     /**
@@ -46,7 +49,6 @@ public class ExtensionFileFilterTest {
     public void testEqualsContract() {
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ExtensionFileFilter.class).usingGetClass()
-            .suppress(Warning.ANNOTATION) // FIXME: remove it after https://github.com/jqno/equalsverifier/issues/152 is fixed
             .verify();
     }
 
diff --git a/test/unit/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTaskTestParent.java b/test/unit/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTaskTestParent.java
index b9a51d5..a2edf2d 100644
--- a/test/unit/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTaskTestParent.java
+++ b/test/unit/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTaskTestParent.java
@@ -39,6 +39,15 @@ public abstract class AbstractDownloadTaskTestParent {
     protected abstract String getRemoteFile();
 
     /**
+     * Returns the {@code Content-Type} with which to serve the file referenced
+     * by {@link #getRemoteFile()}
+     * @return the {@code Content-Type} string for file {@link #getRemoteFile()}
+     */
+    protected String getRemoteContentType() {
+        return "text/xml";
+    }
+
+    /**
      * Returns the http URL to remote test file to download.
      * @return the http URL to remote test file to download
      */
@@ -53,7 +62,7 @@ public abstract class AbstractDownloadTaskTestParent {
         wireMockRule.stubFor(get(urlEqualTo("/" + getRemoteFile()))
                 .willReturn(aResponse()
                     .withStatus(200)
-                    .withHeader("Content-Type", "text/xml")
+                    .withHeader("Content-Type", getRemoteContentType())
                     .withBodyFile(getRemoteFile())));
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/actions/downloadtasks/PluginDownloadTaskTest.java b/test/unit/org/openstreetmap/josm/actions/downloadtasks/PluginDownloadTaskTest.java
new file mode 100644
index 0000000..145177c
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/downloadtasks/PluginDownloadTaskTest.java
@@ -0,0 +1,163 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.downloadtasks;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.Collections;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.plugins.PluginDownloadTask;
+import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import com.google.common.io.ByteStreams;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests for class {@link PluginDownloadTask}.
+ */
+public class PluginDownloadTaskTest extends AbstractDownloadTaskTestParent {
+    protected String pluginPath;
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().https().assumeRevision(
+        "Revision: 8000\n"
+    ).preferences();
+
+    @Override
+    protected String getRemoteContentType() {
+        return "application/java-archive";
+    }
+
+    @Override
+    protected String getRemoteFile() {
+        return this.pluginPath;
+    }
+
+    /**
+     * Test download task when updating a plugin that we already have in our plugins directory
+     * and the downloaded file is valid
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testUpdatePluginValid() throws Exception {
+        this.pluginPath = "plugin/dummy_plugin.jar";
+        this.mockHttp();
+
+        final File srcPluginFile = new File(
+            new File(TestUtils.getTestDataRoot()), "__files/" + this.pluginPath
+        );
+        final File pluginDir = Main.pref.getPluginsDirectory();
+        final File pluginFile = new File(pluginDir, "dummy_plugin.jar");
+        final File pluginFileNew = new File(pluginDir, "dummy_plugin.jar.new");
+
+        // put existing "plugin file" in place
+        pluginFile.getParentFile().mkdirs();
+        final byte[] existingPluginContents = "Existing plugin contents 123".getBytes();
+        try (FileOutputStream existingPluginOutputStream = new FileOutputStream(pluginFile)) {
+            existingPluginOutputStream.write(existingPluginContents);
+        }
+
+        // get PluginInformation from jar file
+        final PluginInformation pluginInformation = new PluginInformation(srcPluginFile);
+        // ...and grafting on the downloadlink
+        pluginInformation.downloadlink = this.getRemoteFileUrl();
+
+        final PluginDownloadTask pluginDownloadTask = new PluginDownloadTask(
+            NullProgressMonitor.INSTANCE,
+            Collections.singletonList(pluginInformation),
+            null
+        );
+        pluginDownloadTask.run();
+
+        // the ".jar.new" file should have been deleted
+        assertFalse(pluginFileNew.exists());
+        // the ".jar" file should still exist
+        assertTrue(pluginFile.exists());
+        try (
+            FileInputStream pluginDirPluginStream = new FileInputStream(pluginFile);
+            FileInputStream srcPluginStream = new FileInputStream(srcPluginFile);
+        ) {
+            // and its contents should equal those that were served to the task
+            assertArrayEquals(
+                ByteStreams.toByteArray(pluginDirPluginStream),
+                ByteStreams.toByteArray(srcPluginStream)
+            );
+        }
+    }
+
+    /**
+     * Test download task when updating a plugin that we already have in our plugins directory
+     * and the downloaded file is not a valid jar file.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testUpdatePluginCorrupt() throws Exception {
+        this.pluginPath = "plugin/corrupted_plugin.jar";
+        this.mockHttp();
+
+        final File srcPluginFile = new File(
+            new File(TestUtils.getTestDataRoot()), "__files/" + this.pluginPath
+        );
+        final File pluginDir = Main.pref.getPluginsDirectory();
+        final File pluginFile = new File(pluginDir, "corrupted_plugin.jar");
+        final File pluginFileNew = new File(pluginDir, "corrupted_plugin.jar.new");
+        // have to store this manifest externally as it clearly can't be read from our corrupted plugin
+        final File pluginManifest = new File(TestUtils.getTestDataRoot(), "plugin/corrupted_plugin.MANIFEST.MF");
+
+        pluginFile.getParentFile().mkdirs();
+        final byte[] existingPluginContents = "Existing plugin contents 123".getBytes();
+        try (FileOutputStream existingPluginOutputStream = new FileOutputStream(pluginFile)) {
+            existingPluginOutputStream.write(existingPluginContents);
+        }
+
+        try (FileInputStream manifestInputStream = new FileInputStream(pluginManifest)) {
+            final PluginInformation pluginInformation = new PluginInformation(
+                manifestInputStream,
+                "corrupted_plugin",
+                this.getRemoteFileUrl()
+            );
+            final PluginDownloadTask pluginDownloadTask = new PluginDownloadTask(
+                NullProgressMonitor.INSTANCE,
+                Collections.singletonList(pluginInformation),
+                null
+            );
+            pluginDownloadTask.run();
+        }
+
+        // the ".jar.new" file should exist, even though invalid
+        assertTrue(pluginFileNew.exists());
+        // the ".jar" file should still exist
+        assertTrue(pluginFile.exists());
+        try (
+            FileInputStream pluginDirPluginNewStream = new FileInputStream(pluginFileNew);
+            FileInputStream pluginDirPluginStream = new FileInputStream(pluginFile);
+            FileInputStream srcPluginStream = new FileInputStream(srcPluginFile);
+        ) {
+            // the ".jar" file's contents should be as before
+            assertArrayEquals(
+                existingPluginContents,
+                ByteStreams.toByteArray(pluginDirPluginStream)
+            );
+            // just assert that the "corrupt" jar file made it through in tact
+            assertArrayEquals(
+                ByteStreams.toByteArray(pluginDirPluginNewStream),
+                ByteStreams.toByteArray(srcPluginStream)
+            );
+        }
+    }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java b/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
index 66c7265..6afa399 100644
--- a/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
@@ -39,7 +39,7 @@ public class DrawActionTest {
      */
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform().main().projection();
+    public JOSMTestRules test = new JOSMTestRules().platform().main().projection().timeout(20000);
 
     /**
      * Non regression test case for bug #12011.
@@ -105,8 +105,10 @@ public class DrawActionTest {
 
     /**
      * Non regression test case for bug #14762.
+     * @deprecated test to remove
      */
     @Test
+    @Deprecated
     public void testTicket14762() {
         DrawAction action = new DrawAction();
         assertNull(action.getLayerManager().getEditDataSet());
diff --git a/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java b/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java
index db22271..d64236e 100644
--- a/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java
+++ b/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java
@@ -3,13 +3,11 @@ package org.openstreetmap.josm.data.cache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.regex.Matcher;
 
 import org.apache.commons.jcs.access.behavior.ICacheAccess;
 import org.junit.Before;
@@ -172,27 +170,4 @@ public class JCSCachedTileLoaderJobTest {
     private static ICacheAccess<String, CacheEntry> getCache() throws IOException {
         return JCSCacheManager.getCache("test");
     }
-
-    /**
-     * Test that error message sent by Tomcat can be parsed.
-     */
-    @Test
-    public void testTomcatErrorMessage() {
-        Matcher m = JCSCachedTileLoaderJob.TOMCAT_ERR_MESSAGE.matcher(
-            "<html><head><title>Apache Tomcat/DGFiP - Rapport d''erreur</title><style><!--"+
-                "H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;} "+
-                "H2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;} "+
-                "H3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;} "+
-                "BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;} "+
-                "B {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;} "+
-                "P {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}"+
-                "A {color : black;}A.name {color : black;}HR {color : #525D76;}"+
-            "--></style> </head><body><h1>Etat HTTP 400 - La commune demandée n'existe pas ou n'est pas accessible.</h1>"+
-            "<HR size=\"1\" noshade=\"noshade\">"+
-            "<p><b>type</b> Rapport d''état</p><p><b>message</b> <u>La commune demandée n'existe pas ou n'est pas accessible.</u></p>"+
-            "<p><b>description</b> <u>La requête envoyée par le client était syntaxiquement incorrecte.</u></p>"+
-            "<HR size=\"1\" noshade=\"noshade\"><h3>Apache Tomcat/DGFiP</h3></body></html>");
-        assertTrue(m.matches());
-        assertEquals("La commune demandée n'existe pas ou n'est pas accessible.", m.group(1));
-    }
 }
diff --git a/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java b/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java
index 3152a14..f99e39f 100644
--- a/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java
+++ b/test/unit/org/openstreetmap/josm/data/gpx/WayPointTest.java
@@ -1,8 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.gpx;
 
-import java.awt.color.ColorSpace;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
@@ -33,7 +31,6 @@ public class WayPointTest {
         EqualsVerifier.forClass(WayPoint.class).usingGetClass()
             .suppress(Warning.NONFINAL_FIELDS)
             .withIgnoredFields("customColoring", "dir", "drawLine", "east", "north", "eastNorthCacheKey")
-            .withPrefabValues(ColorSpace.class, ColorSpace.getInstance(ColorSpace.CS_sRGB), ColorSpace.getInstance(ColorSpace.CS_LINEAR_RGB))
             .verify();
     }
 }
diff --git a/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java b/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java
index e40bfd1..ed9ce17 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java
@@ -5,7 +5,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
@@ -17,6 +16,7 @@ import java.util.Collections;
 
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -54,6 +54,12 @@ public class SearchCompilerTest {
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences();
 
+    /**
+     * Rule to assert exception message.
+     */
+    @Rule
+    public ExpectedException expectedEx = ExpectedException.none();
+
     private static final class SearchContext {
         final DataSet ds = new DataSet();
         final Node n1 = new Node(LatLon.ZERO);
@@ -401,15 +407,13 @@ public class SearchCompilerTest {
 
     /**
      * Compiles "foo type bar" and tests the parse error message
+     * @throws SearchParseError always
      */
     @Test
-    public void testFooTypeBar() {
-        try {
-            SearchCompiler.compile("foo type bar");
-            fail();
-        } catch (SearchParseError parseError) {
-            assertEquals("<html>Expecting <code>:</code> after <i>type</i>", parseError.getMessage());
-        }
+    public void testFooTypeBar() throws SearchParseError {
+        expectedEx.expect(SearchParseError.class);
+        expectedEx.expectMessage("<html>Expecting <code>:</code> after <i>type</i></html>");
+        SearchCompiler.compile("foo type bar");
     }
 
     /**
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java
index 38769f3..a297fc2 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java
@@ -84,14 +84,14 @@ public class CorrelateGpxWithImagesTest {
         // and not taken from GPX track.
         assertEquals(null, ib.getSpeed());
         assertEquals(null, i0.getSpeed());
-        assertEquals(new Double(11.675317966018756), i1.getSpeed(), 0.000001);
-        assertEquals(new Double(24.992418392716967), i2.getSpeed(), 0.000001);
-        assertEquals(new Double(27.307968754679223), i3.getSpeed(), 0.000001);
+        assertEquals(Double.valueOf(11.675317966018756), i1.getSpeed(), 0.000001);
+        assertEquals(Double.valueOf(24.992418392716967), i2.getSpeed(), 0.000001);
+        assertEquals(Double.valueOf(27.307968754679223), i3.getSpeed(), 0.000001);
         assertEquals(null, ib.getElevation());
-        assertEquals(new Double(471.86), i0.getElevation(), 0.000001);
-        assertEquals(new Double(489.29), i1.getElevation(), 0.000001);
-        assertEquals(new Double((490.40 + 489.75) / 2), i2.getElevation(), 0.000001);
-        assertEquals(new Double(486.368333333), i3.getElevation(), 0.000001);
+        assertEquals(Double.valueOf(471.86), i0.getElevation(), 0.000001);
+        assertEquals(Double.valueOf(489.29), i1.getElevation(), 0.000001);
+        assertEquals(Double.valueOf((490.40 + 489.75) / 2), i2.getElevation(), 0.000001);
+        assertEquals(Double.valueOf(486.368333333), i3.getElevation(), 0.000001);
         assertEquals(null, ib.getGpsTime());
         assertEquals(DateUtils.fromString("2016:01:03 11:59:54"), i0.getGpsTime()); // original time is kept
         assertEquals(DateUtils.fromString("2016:01:03 12:04:01"), i1.getGpsTime());
diff --git a/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java b/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java
index d71e9fd..03607da 100644
--- a/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java
+++ b/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java
@@ -7,6 +7,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.time.LocalDateTime;
@@ -174,4 +175,45 @@ public class OverpassDownloadReaderTest {
                 "(._;>;);\n" +
                 "out meta;").matches());
     }
+
+    /**
+     * Test {@link OverpassDownloadReader#fixQuery(String)}.
+     */
+    @Test
+    public void testFixQuery() {
+        assertNull(OverpassDownloadReader.fixQuery(null));
+
+        assertEquals("out meta;", OverpassDownloadReader.fixQuery("out;"));
+        assertEquals("out meta;", OverpassDownloadReader.fixQuery("out body;"));
+        assertEquals("out meta;", OverpassDownloadReader.fixQuery("out skel;"));
+        assertEquals("out meta;", OverpassDownloadReader.fixQuery("out ids;"));
+
+        assertEquals("out meta id;", OverpassDownloadReader.fixQuery("out id;"));
+        assertEquals("out meta id;", OverpassDownloadReader.fixQuery("out body id;"));
+        assertEquals("out meta id;", OverpassDownloadReader.fixQuery("out skel id;"));
+        assertEquals("out meta id;", OverpassDownloadReader.fixQuery("out ids id;"));
+
+        assertEquals("out meta qt;", OverpassDownloadReader.fixQuery("out qt;"));
+        assertEquals("out meta qt;", OverpassDownloadReader.fixQuery("out body qt;"));
+        assertEquals("out meta qt;", OverpassDownloadReader.fixQuery("out skel qt;"));
+        assertEquals("out meta qt;", OverpassDownloadReader.fixQuery("out ids qt;"));
+
+        assertEquals("[out:xml]", OverpassDownloadReader.fixQuery("[out:json]"));
+        assertEquals("[out:xml]", OverpassDownloadReader.fixQuery("[out:csv(\n" +
+                "    ::\"id\", amenity, name, operator, opening_hours, \"contact:website\", \"contact:phone\", brand, dispensing, lastcheck\n" +
+                "  )]"));
+
+        assertEquals("[out:xml][timeout:25];\n" +
+                "(\n" +
+                "  node[\"historic\"=\"ringfort\"];\n" +
+                "  way[\"historic\"=\"ringfort\"];\n" +
+                ");\n" +
+                "out meta;",
+            OverpassDownloadReader.fixQuery("[out:json][timeout:25];\n" +
+                "(\n" +
+                "  node[\"historic\"=\"ringfort\"];\n" +
+                "  way[\"historic\"=\"ringfort\"];\n" +
+                ");\n" +
+                "out body;"));
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java b/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java
index b45bc09..fe70b10 100644
--- a/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java
+++ b/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java
@@ -2,9 +2,14 @@
 package org.openstreetmap.josm.io.imagery;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
 
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.io.imagery.WMSImagery.WMSGetCapabilitiesException;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -35,4 +40,19 @@ public class WMSImageryTest {
         assertEquals("foo", exc.getMessage());
         assertEquals("bar", exc.getIncomingData());
     }
+
+    /**
+     * Non-regression test for bug #15730.
+     * @throws IOException if any I/O error occurs
+     * @throws WMSGetCapabilitiesException never
+     */
+    @Test
+    public void testTicket15730() throws IOException, WMSGetCapabilitiesException {
+        try (InputStream is = TestUtils.getRegressionDataStream(15730, "capabilities.xml")) {
+            WMSImagery wms = new WMSImagery();
+            wms.parseCapabilities(null, is);
+            assertEquals(1, wms.getLayers().size());
+            assertTrue(wms.getLayers().get(0).abstr.startsWith("South Carolina  NAIP Imagery 2017    Resolution: 100CM "));
+        }
+    }
 }
diff --git a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
index cec9682..1e26583 100644
--- a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
+++ b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
@@ -2,6 +2,7 @@
 package org.openstreetmap.josm.testutils;
 
 import java.awt.Color;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
@@ -15,9 +16,11 @@ import org.junit.runners.model.InitializationError;
 import org.junit.runners.model.Statement;
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.actions.DeleteAction;
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.data.UserIdentityManager;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
@@ -58,6 +61,8 @@ public class JOSMTestRules implements TestRule {
     private APIType useAPI = APIType.NONE;
     private String i18n = null;
     private TileSourceRule tileSourceRule;
+    private String assumeRevisionString;
+    private Version originalVersion;
     private boolean platform;
     private boolean useProjection;
     private boolean useProjectionNadGrids;
@@ -136,6 +141,16 @@ public class JOSMTestRules implements TestRule {
     }
 
     /**
+     * Mock this test's assumed JOSM version (as reported by {@link Version}).
+     * @param revisionProperties mock contents of JOSM's {@code REVISION} properties file
+     * @return this instance, for easy chaining
+     */
+    public JOSMTestRules assumeRevision(final String revisionProperties) {
+        this.assumeRevisionString = revisionProperties;
+        return this;
+    }
+
+    /**
      * Enable the dev.openstreetmap.org API for this test.
      * @return this instance, for easy chaining
      */
@@ -276,7 +291,7 @@ public class JOSMTestRules implements TestRule {
 
     /**
      * Use the {@link Main#main}, {@code Main.contentPanePrivate}, {@code Main.mainPanel},
-     *         {@link Main#menu}, {@link Main#toolbar} global variables in this test.
+     *         global variables in this test.
      * @return this instance, for easy chaining
      * @since 12557
      */
@@ -286,6 +301,14 @@ public class JOSMTestRules implements TestRule {
         return this;
     }
 
+    private static class MockVersion extends Version {
+        MockVersion(final String propertiesString) {
+            super.initFromRevisionInfo(
+                new ByteArrayInputStream(propertiesString.getBytes())
+            );
+        }
+    }
+
     @Override
     public Statement apply(Statement base, Description description) {
         Statement statement = base;
@@ -317,13 +340,20 @@ public class JOSMTestRules implements TestRule {
     /**
      * Set up before running a test
      * @throws InitializationError If an error occured while creating the required environment.
+     * @throws ReflectiveOperationException if a reflective access error occurs
      */
-    protected void before() throws InitializationError {
+    protected void before() throws InitializationError, ReflectiveOperationException {
         // Tests are running headless by default.
         System.setProperty("java.awt.headless", "true");
 
         cleanUpFromJosmFixture();
 
+        if (this.assumeRevisionString != null) {
+            this.originalVersion = Version.getInstance();
+            final Version replacementVersion = new MockVersion(this.assumeRevisionString);
+            TestUtils.setPrivateStaticField(Version.class, "instance", replacementVersion);
+        }
+
         Config.setPreferencesInstance(Main.pref);
         Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());
         // All tests use the same timezone.
@@ -464,9 +494,10 @@ public class JOSMTestRules implements TestRule {
 
     /**
      * Clean up after running a test
+     * @throws ReflectiveOperationException if a reflective access error occurs
      */
     @SuppressFBWarnings("DM_GC")
-    protected void after() {
+    protected void after() throws ReflectiveOperationException {
         // Sync AWT Thread
         GuiHelper.runInEDTAndWait(new Runnable() {
             @Override
@@ -478,8 +509,14 @@ public class JOSMTestRules implements TestRule {
         MemoryManagerTest.resetState(allowMemoryManagerLeaks);
 
         // TODO: Remove global listeners and other global state.
+        Main.clearProjectionChangeListeners();
         Main.pref.resetToInitialState();
         Main.platform = null;
+
+        if (this.assumeRevisionString != null && this.originalVersion != null) {
+            TestUtils.setPrivateStaticField(Version.class, "instance", this.originalVersion);
+        }
+
         // Parts of JOSM uses weak references - destroy them.
         System.gc();
     }
diff --git a/tools/checkstyle/META-INF/MANIFEST.MF b/tools/checkstyle/META-INF/MANIFEST.MF
index 48b28c1..ea1ca48 100644
--- a/tools/checkstyle/META-INF/MANIFEST.MF
+++ b/tools/checkstyle/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JOSM Checkstyle Eclipse Plugin
 Bundle-SymbolicName: org.openstreetmap.josm.checkstyle-eclipse-plugin;singleton:=true
-Bundle-Version: 8.5.0.qualifier
+Bundle-Version: 8.7.0.qualifier
 Require-Bundle: net.sf.eclipsecs.checkstyle,
  net.sf.eclipsecs.core,
  net.sf.eclipsecs.ui

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git



More information about the Pkg-grass-devel mailing list